diff options
| author | Anatol Belski <ab@php.net> | 2016-10-12 20:21:27 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-14 01:49:39 +0200 |
| commit | 2c38f70a94d49a5148c4fbddf04296d74a6b9b49 (patch) | |
| tree | cbebe1dd80433782d9473a22943f46c87262a5ea /Zend/zend_exceptions.c | |
| parent | 11e7447e044fe0b719e38246babbed6e8d56ebf3 (diff) | |
| download | php-git-2c38f70a94d49a5148c4fbddf04296d74a6b9b49.tar.gz | |
fix wrong merge
(cherry picked from commit 821a230f290b7457d4223001286afe00fe887277)
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 4f156c0bcc..bff07cb9f1 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -306,7 +306,7 @@ ZEND_METHOD(exception, __construct) #define CHECK_EXC_TYPE(id, type) \ pvalue = zend_read_property_ex(i_get_exception_base(object), (object), CG(known_strings)[id], 1, &value); \ if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \ - zend_unset_property(i_get_exception_base(object), object, ZEND_STR_PREVIOUS, sizeof(ZEND_STR_PREVIOUS)-1); \ + zend_unset_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1); \ } ZEND_METHOD(exception, __wakeup) @@ -319,12 +319,11 @@ ZEND_METHOD(exception, __wakeup) CHECK_EXC_TYPE(ZEND_STR_FILE, IS_STRING); CHECK_EXC_TYPE(ZEND_STR_LINE, IS_LONG); CHECK_EXC_TYPE(ZEND_STR_TRACE, IS_ARRAY); - CHECK_EXC_TYPE(ZEND_STR_PREVIOUS, IS_OBJECT); - pvalue = zend_read_property(i_get_exception_base(object), object, ZEND_STR_PREVIOUS, sizeof(ZEND_STR_PREVIOUS)-1, 1, &value); + 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)) || pvalue == object)) { - zend_unset_property(i_get_exception_base(object), object, ZEND_STR_PREVIOUS, sizeof(ZEND_STR_PREVIOUS)-1); + zend_unset_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1); } } /* }}} */ |