com php-src: Fixed assignment of reference to itself: Zend/zend_execute.c
| From: | Dmitry Stogov | Date: | Thu, 14 Aug 2014 08:01:28 +0000 |
| Subject: | com php-src: Fixed assignment of reference to itself: Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79857@lists.php.net to get a copy of this message | ||
Commit: 25bda5ae3caa6fe3f7d36ca2f8ee0d3070bf2f67
Author: Dmitry Stogov <dmitry@zend.com> Thu, 14 Aug 2014 12:01:28 +0400
Parents: 753813e542644461f61d8f0854f6e4dc4c2179df
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=25bda5ae3caa6fe3f7d36ca2f8ee0d3070bf2f67
Log:
Fixed assignment of reference to itself
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 700ce4b..f3e97d7 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -933,6 +933,9 @@ static inline zval* zend_assign_to_variable(zval *variable_ptr, zval *value TSRM
value = Z_REFVAL_P(value);
}
if (Z_REFCOUNTED_P(value)) {
+ if (UNEXPECTED(variable_ptr == value)) {
+ return variable_ptr;
+ }
Z_ADDREF_P(value);
}
}