com php-src: fix wrong merge: Zend/zend_exceptions.c

Commit: 821a230f290b7457d4223001286afe00fe887277 Author: Anatol Belski <ab@php.net> Wed, 12 Oct 2016 20:21:27 +0200 Parents: 37ae5f3931b60c55e5004b6da912c4a957bca274 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=821a230f290b7457d4223001286afe00fe887277 Log: fix wrong merge Changed paths: M Zend/zend_exceptions.c Diff: diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 4f156c0..bff07cb 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); } } /* }}} */