Skip to content

Commit 2c38f70

Browse files
committed
fix wrong merge
(cherry picked from commit 821a230)
1 parent 11e7447 commit 2c38f70

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Zend/zend_exceptions.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ ZEND_METHOD(exception, __construct)
306306
#define CHECK_EXC_TYPE(id, type) \
307307
pvalue = zend_read_property_ex(i_get_exception_base(object), (object), CG(known_strings)[id], 1, &value); \
308308
if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \
309-
zend_unset_property(i_get_exception_base(object), object, ZEND_STR_PREVIOUS, sizeof(ZEND_STR_PREVIOUS)-1); \
309+
zend_unset_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1); \
310310
}
311311

312312
ZEND_METHOD(exception, __wakeup)
@@ -319,12 +319,11 @@ ZEND_METHOD(exception, __wakeup)
319319
CHECK_EXC_TYPE(ZEND_STR_FILE, IS_STRING);
320320
CHECK_EXC_TYPE(ZEND_STR_LINE, IS_LONG);
321321
CHECK_EXC_TYPE(ZEND_STR_TRACE, IS_ARRAY);
322-
CHECK_EXC_TYPE(ZEND_STR_PREVIOUS, IS_OBJECT);
323-
pvalue = zend_read_property(i_get_exception_base(object), object, ZEND_STR_PREVIOUS, sizeof(ZEND_STR_PREVIOUS)-1, 1, &value);
322+
pvalue = zend_read_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1, 1, &value);
324323
if (pvalue && Z_TYPE_P(pvalue) != IS_NULL && (Z_TYPE_P(pvalue) != IS_OBJECT ||
325324
!instanceof_function(Z_OBJCE_P(pvalue), i_get_exception_base(object)) ||
326325
pvalue == object)) {
327-
zend_unset_property(i_get_exception_base(object), object, ZEND_STR_PREVIOUS, sizeof(ZEND_STR_PREVIOUS)-1);
326+
zend_unset_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1);
328327
}
329328
}
330329
/* }}} */

0 commit comments

Comments
 (0)