com php-src: Fixed bug #70863 Incorect logic to increment_fun ction for proxy objects: Zend/zend_operators.c sapi/cli/tests/006.phpt

Commit: 8155ecba61a9c724c7b2bdeb673602ae27923d71 Author: Anatol Belski <ab@php.net> Fri, 6 Nov 2015 23:03:15 +0100 Parents: 6897c1116af54241e9e49a74f3cdf887ecca9d79 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8155ecba61a9c724c7b2bdeb673602ae27923d71 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> ]