diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-20 16:38:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-20 16:38:00 +0800 |
| commit | a2e4e64682ac49422dde6f08ca091f3d16a6aeb2 (patch) | |
| tree | a82c5e6998ab1b17bfa553f4b477995ec241b2d4 /Zend/zend_exceptions.c | |
| parent | 64a90a6b985be72ae0961ae0aa05b158b3586d9f (diff) | |
| parent | a1c887964e34c0531b238e33a6b85e9925731194 (diff) | |
| download | php-git-a2e4e64682ac49422dde6f08ca091f3d16a6aeb2.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_exceptions.c
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 002f519bc6..dd137dfb95 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -70,7 +70,8 @@ ZEND_API zend_class_entry *zend_get_exception_base(zval *object) void zend_exception_set_previous(zend_object *exception, zend_object *add_previous) { - zval tmp, *previous, zv, *pzv, rv; + zval *previous, *pzv; + zval tmp, zv, rv; zend_class_entry *base_ce; if (exception == add_previous || !add_previous || !exception) { @@ -81,6 +82,13 @@ void zend_exception_set_previous(zend_object *exception, zend_object *add_previo zend_error_noreturn(E_CORE_ERROR, "Previous exception must implement Throwable"); return; } + pzv = zend_read_property(i_get_exception_base(&tmp), &tmp, "previous", sizeof("previous")-1, 1, &rv); + while (Z_TYPE_P(pzv) == IS_OBJECT) { + if (Z_OBJ_P(pzv) == exception) { + return; + } + pzv = zend_read_property(i_get_exception_base(pzv), pzv, "previous", sizeof("previous")-1, 1, &rv); + } ZVAL_OBJ(&zv, exception); pzv = &zv; do { |