com php-src: Fixed bug #72581 (previous property undefined in Exception after deserialization): NEWS Zend/tests/bug72581.phpt Zend/zend_exceptions.c

Commit: 42902919bc0f97977e116415c9968dc6b23b12d2 Author: Xinchen Hui <laruence@gmail.com> Tue, 12 Jul 2016 11:51:20 +0800 Parents: 90e11e0c139bfb6c9e5400afc5f2bfce52eed31e Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=42902919bc0f97977e116415c9968dc6b23b12d2 Log: Fixed bug #72581 (previous property undefined in Exception after deserialization) Bugs: https://bugs.php.net/72581 Changed paths: M NEWS A Zend/tests/bug72581..phpt M Zend/zend_exceptions.c Diff: diff --git a/NEWS b/NEWS index b228963..437d77f 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2016 PHP 7.0.10 - Core: + . Fixed bug #72581 (previous property undefined in Exception after + deserialization). (Laruence) . Fixed bug #72496 (Cannot declare public method with signature incompatible with parent private method). (Pedro Magalhães) . Fixed bug #72024 (microtime() leaks memory). (maroszek at gmx dot net) diff --git a/Zend/tests/bug72581.phpt b/Zend/tests/bug72581.phpt new file mode 100644 index 0000000..775f6e3 --- /dev/null +++ b/Zend/tests/bug72581.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #72581 (previous property undefined in Exception after deserialization) +--FILE-- +<?php + +$e = new Exception('aaa', 200); + +$a = serialize($e); + +$b = unserialize($a); + +var_dump($b->__toString()); +?> +--EXPECTF-- +string(%s) "Exception: aaa in %sbug72581.php:%d +Stack trace: +#0 {main}" diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 663e83f..374f304 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); \