archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #72581 (previous property undefined in Exception after deserialization)

Browse source
This commit is contained in:
Xinchen Hui 2016-07-12 11:51:20 +08:00
parent 90e11e0c13
commit 42902919bc
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -3,6 +3,8 @@ PHP NEWS
?? ??? 2016 PHP 7.0.10 ?? ??? 2016 PHP 7.0.10
- Core: - Core:
. Fixed bug #72581 (previous property undefined in Exception after
deserialization). (Laruence)
. Fixed bug #72496 (Cannot declare public method with signature incompatible . Fixed bug #72496 (Cannot declare public method with signature incompatible
with parent private method). (Pedro Magalhães) with parent private method). (Pedro Magalhães)
. Fixed bug #72024 (microtime() leaks memory). (maroszek at gmx dot net) . Fixed bug #72024 (microtime() leaks memory). (maroszek at gmx dot net)

17
Zend/tests/bug72581.phpt Normal file
View file

@ -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}"

3
Zend/zend_exceptions.c
View file

@ -291,9 +291,8 @@ ZEND_METHOD(exception, __construct)
/* {{{ proto Exception::__wakeup() /* {{{ proto Exception::__wakeup()
Exception unserialize checks */ Exception unserialize checks */
#define CHECK_EXC_TYPE(name, type) \ #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); \ 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 tmp; \
ZVAL_STRINGL(&tmp, name, sizeof(name) - 1); \ ZVAL_STRINGL(&tmp, name, sizeof(name) - 1); \
Z_OBJ_HANDLER_P(object, unset_property)(object, &tmp, NULL); \ Z_OBJ_HANDLER_P(object, unset_property)(object, &tmp, NULL); \