Fixed bug #70863 Incorect logic to increment_function for proxy objects

UziTech · Nov 6, 2015 · 8155ecb · 8155ecb
1 parent 6897c11
commit 8155ecb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -2277,7 +2277,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 				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
@@ -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> ]