com php-src: Fixed reference separation: Zend/zend_object_h andlers.c
| From: | Dmitry Stogov | Date: | Tue, 18 Mar 2014 08:37:51 +0000 |
| Subject: | com php-src: Fixed reference separation: Zend/zend_object_h andlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77553@lists.php.net to get a copy of this message | ||
Commit: 2adecc6dc283fa39f4fc9d44ec128be497152323
Author: Dmitry Stogov <dmitry@zend.com> Tue, 18 Mar 2014 12:37:51 +0400
Parents: e47c080ce8c2f32bc6ea61e0196a6ac48435f2dc
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2adecc6dc283fa39f4fc9d44ec128be497152323
Log:
Fixed reference separation
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index ec5c7a3..24a3a9e 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -642,7 +642,10 @@ write_std_property:
/* if we assign referenced variable, we should separate it */
if (Z_REFCOUNTED_P(value)) {
if (Z_ISREF_P(value)) {
- ZVAL_DUP(value, Z_REFVAL_P(value));
+ zval tmp;
+
+ ZVAL_DUP(&tmp, Z_REFVAL_P(value));
+ value = &tmp;
} else {
Z_ADDREF_P(value);
}