diff options
| author | Anatol Belski <ab@php.net> | 2015-11-06 23:03:15 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-11-08 04:29:11 +0100 |
| commit | 68910e314ff62bd9f326cc11a48bfd65e5a32220 (patch) | |
| tree | 6a59978e9408af36db06d583e6c9d6c511e097c6 | |
| parent | 4b48b297184d499e19018a83791674c0dbf63f68 (diff) | |
| download | php-git-68910e314ff62bd9f326cc11a48bfd65e5a32220.tar.gz | |
Fixed bug #70863 Incorect logic to increment_function for proxy objects
| -rw-r--r-- | Zend/zend_operators.c | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/006.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 14dafe353b..bad2aa648f 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 1170ea217a..b24da56660 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> ] |