diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-12 11:51:20 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-12 11:51:20 +0800 |
| commit | 42902919bc0f97977e116415c9968dc6b23b12d2 (patch) | |
| tree | d9d2f675c64ebae86aa4d6923a02d8939a982053 /Zend/zend_exceptions.c | |
| parent | 90e11e0c139bfb6c9e5400afc5f2bfce52eed31e (diff) | |
| download | php-git-42902919bc0f97977e116415c9968dc6b23b12d2.tar.gz | |
Fixed bug #72581 (previous property undefined in Exception after deserialization)
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); \ |