diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-28 10:41:28 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-28 10:41:28 +0400 |
| commit | 855a030b7b49db58cc203f2ecdc6bdfadf3ed539 (patch) | |
| tree | 57ba6f49a442fd66f4790d85312661edeb7869fb /Zend | |
| parent | 08da14adaceb9b139b3314ed00ac3fd6a3ef2a09 (diff) | |
| download | php-git-855a030b7b49db58cc203f2ecdc6bdfadf3ed539.tar.gz | |
Fixed return value handling in ZEND_ASSIGN_OBJ
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |