Fixed return value handling in ZEND_ASSIGN_OBJ

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index db12b38654db4681eee8ebd7e2da02672ebf307f..135f19757261e713d45dc11a316fbd1e7b7e50c7 100644 (file)
--- 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);