diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-21 00:27:56 -0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-21 00:27:56 -0800 |
| commit | 7b195c9875efa53204a302ad8aae54af4bb6158e (patch) | |
| tree | b88b5e8ce6535b43519a194848cf93be8db7d1d7 /Zend/zend_exceptions.c | |
| parent | a1c887964e34c0531b238e33a6b85e9925731194 (diff) | |
| download | php-git-7b195c9875efa53204a302ad8aae54af4bb6158e.tar.gz | |
Improved fix for bug #70944
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index d1aa6fe9f1..4b38829cd9 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -45,14 +45,15 @@ void zend_exception_set_previous(zval *exception, zval *add_previous TSRMLS_DC) zend_error(E_ERROR, "Cannot set non exception as previous exception"); return; } - ancestor = zend_read_property(default_exception_ce, add_previous, "previous", sizeof("previous")-1, 1 TSRMLS_CC); - while (Z_TYPE_P(ancestor) == IS_OBJECT) { - if (Z_OBJ_HANDLE_P(ancestor) == Z_OBJ_HANDLE_P(exception)) { - return; - } - ancestor = zend_read_property(default_exception_ce, ancestor, "previous", sizeof("previous")-1, 1 TSRMLS_CC); - } while (exception && exception != add_previous && Z_OBJ_HANDLE_P(exception) != Z_OBJ_HANDLE_P(add_previous)) { + ancestor = zend_read_property(default_exception_ce, add_previous, "previous", sizeof("previous")-1, 1 TSRMLS_CC); + while (Z_TYPE_P(ancestor) == IS_OBJECT) { + if (Z_OBJ_HANDLE_P(ancestor) == Z_OBJ_HANDLE_P(exception)) { + zval_ptr_dtor(&add_previous); + return; + } + ancestor = zend_read_property(default_exception_ce, ancestor, "previous", sizeof("previous")-1, 1 TSRMLS_CC); + } previous = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 1 TSRMLS_CC); if (Z_TYPE_P(previous) == IS_NULL) { zend_update_property(default_exception_ce, exception, "previous", sizeof("previous")-1, add_previous TSRMLS_CC); |