diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-24 22:29:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-24 22:29:19 +0200 |
| commit | 4abf423d750244fdebf5a67bb531193bfd16aed8 (patch) | |
| tree | 8fe5e1a22b75458d0a736f8a8380e1ffb3b70bf4 /Zend/zend_exceptions.c | |
| parent | 66cf76ee5412353b2a070f42dec7fc618f41e8eb (diff) | |
| parent | 14b22704c7cf3b8d42b08cb3e5d387ef6a962e12 (diff) | |
| download | php-git-4abf423d750244fdebf5a67bb531193bfd16aed8.tar.gz | |
Merge branch 'PHP-7.2'
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index f0b2d5e824..72a3c806e5 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -325,7 +325,7 @@ ZEND_METHOD(exception, __wakeup) CHECK_EXC_TYPE(ZEND_STR_TRACE, IS_ARRAY); pvalue = zend_read_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1, 1, &value); if (pvalue && Z_TYPE_P(pvalue) != IS_NULL && (Z_TYPE_P(pvalue) != IS_OBJECT || - !instanceof_function(Z_OBJCE_P(pvalue), i_get_exception_base(object)) || + !instanceof_function(Z_OBJCE_P(pvalue), zend_ce_throwable) || pvalue == object)) { zend_unset_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1); } |