From 42902919bc0f97977e116415c9968dc6b23b12d2 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 12 Jul 2016 11:51:20 +0800 Subject: Fixed bug #72581 (previous property undefined in Exception after deserialization) --- Zend/zend_exceptions.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Zend/zend_exceptions.c') diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 663e83f821..374f3045b3 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -291,9 +291,8 @@ ZEND_METHOD(exception, __construct) /* {{{ proto Exception::__wakeup() Exception unserialize checks */ #define CHECK_EXC_TYPE(name, type) \ - ZVAL_UNDEF(&value); \ pvalue = zend_read_property(i_get_exception_base(object), (object), name, sizeof(name) - 1, 1, &value); \ - if(Z_TYPE_P(pvalue) != IS_UNDEF && Z_TYPE_P(pvalue) != type) { \ + if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \ zval tmp; \ ZVAL_STRINGL(&tmp, name, sizeof(name) - 1); \ Z_OBJ_HANDLER_P(object, unset_property)(object, &tmp, NULL); \ -- cgit v1.2.1