From 855a030b7b49db58cc203f2ecdc6bdfadf3ed539 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 28 Feb 2014 10:41:28 +0400 Subject: [PATCH] Fixed return value handling in ZEND_ASSIGN_OBJ --- Zend/zend_execute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index db12b38654d..135f1975726 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);