php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed return value handling in ZEND_ASSIGN_OBJ

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-28 10:41:28 +04:00
parent 08da14adac
commit 855a030b7b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_execute.c
View File

@@ -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);