com php-src: Fixed bug #70863 Incorect logic to increment_fun ction for proxy objects: Zend/zend_operators.c sapi/cli/tests/006.phpt
| From: | Anatol Belski | Date: | Sun, 08 Nov 2015 03:29:11 +0000 |
| Subject: | com php-src: Fixed bug #70863 Incorect logic to increment_fun ction for proxy objects: Zend/zend_operators.c sapi/cli/tests/006.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89672@lists.php.net to get a copy of this message | ||
Commit: 68910e314ff62bd9f326cc11a48bfd65e5a32220
Author: Anatol Belski <ab@php.net> Fri, 6 Nov 2015 23:03:15 +0100
Parents: 4b48b297184d499e19018a83791674c0dbf63f68
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=68910e314ff62bd9f326cc11a48bfd65e5a32220
Log:
Fixed bug #70863 Incorect logic to increment_function for proxy objects
Bugs:
https://bugs.php.net/70863
Changed paths:
M Zend/zend_operators.c
M sapi/cli/tests/006.phpt
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 14dafe3..bad2aa6 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -2277,7 +2277,7 @@ try_again:
zval *val;
val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv);
- Z_ADDREF_P(val);
+ Z_TRY_ADDREF_P(val);
increment_function(val);
Z_OBJ_HANDLER_P(op1, set)(op1, val);
zval_ptr_dtor(val);
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 1170ea2..b24da56 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -25,7 +25,7 @@ string(44) "Exception: Extension unknown does not exist
"
string(37) "Exception: Extension does not exist
"
-string(%d) "Extension [ <persistent> extension #%d pcre version %d.%d.%d%a ] {
+string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {
- INI {
Entry [ pcre.backtrack_limit <ALL> ]