From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 28 Feb 2014 06:41:28 +0000 (+0400)
Subject: Fixed return value handling in ZEND_ASSIGN_OBJ
X-Git-Tag: POST_PHPNG_MERGE~412^2~492^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=855a030b7b49db58cc203f2ecdc6bdfadf3ed539;p=php

Fixed return value handling in ZEND_ASSIGN_OBJ
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index db12b38654..135f197572 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -830,7 +830,7 @@ static inline void zend_assign_to_object(zval *retval, zval *object_ptr, zval *p
 		Z_OBJ_HT_P(object)->write_dimension(object, property_name, value TSRMLS_CC);
 	}
 
-	if (retval && EG(exception) != NULL) {
+	if (retval && !EG(exception)) {
 		ZVAL_COPY(retval, value);
 	}
 	zval_ptr_dtor(value);