com php-src: additional catch to bug #70863: Zend/zend_operat ors.h
| From: | Anatol Belski | Date: | Mon, 09 Nov 2015 23:38:11 +0000 |
| Subject: | com php-src: additional catch to bug #70863: Zend/zend_operat ors.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89719@lists.php.net to get a copy of this message | ||
Commit: a3f1154b3d95aa9508cef19102ad553fed4f9189
Author: Anatol Belski <ab@php.net> Tue, 10 Nov 2015 00:38:11 +0100
Parents: 2e38918ba41a9c8b5767f93c29e172fbfb97b3fe
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3f1154b3d95aa9508cef19102ad553fed4f9189
Log:
additional catch to bug #70863
Bugs:
https://bugs.php.net/70863
Changed paths:
M Zend/zend_operators.h
Diff:
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index f8c155d..c762f19 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -757,7 +757,7 @@ static zend_always_inline int fast_is_not_identical_function(zval *op1, zval *op
int ret;
\
zval rv;
\
zval *objval = Z_OBJ_HANDLER_P(op1, get)(op1, &rv); \
- Z_ADDREF_P(objval);
\
+ Z_TRY_ADDREF_P(objval);
\
ret = binary_op(objval, objval, op2); \
Z_OBJ_HANDLER_P(op1, set)(op1, objval); \
zval_ptr_dtor(objval);
\