diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-12 11:52:21 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-12 11:52:21 +0800 |
| commit | 0478e431cfa24476f6eed1cfbf30250c549aa59d (patch) | |
| tree | cf68417baa8d99155aafcca09a755041ac05c67a | |
| parent | 1ba20e311e4f9046c192f9cc23cdaaf04ec5fa70 (diff) | |
| parent | 42902919bc0f97977e116415c9968dc6b23b12d2 (diff) | |
| download | php-git-0478e431cfa24476f6eed1cfbf30250c549aa59d.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72581 (previous property undefined in Exception after deserialization)
Conflicts:
Zend/zend_exceptions.c
| -rw-r--r-- | Zend/tests/bug72581.phpt | 17 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
2 files changed, 18 insertions, 2 deletions
diff --git a/Zend/tests/bug72581.phpt b/Zend/tests/bug72581.phpt new file mode 100644 index 0000000000..775f6e360d --- /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 f73dde1a97..7fd55a4fc8 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -303,9 +303,8 @@ ZEND_METHOD(exception, __construct) /* {{{ proto Exception::__wakeup() Exception unserialize checks */ #define CHECK_EXC_TYPE(id, type) \ - ZVAL_UNDEF(&value); \ pvalue = zend_read_property_ex(i_get_exception_base(object), (object), CG(known_strings)[id], 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_STR_COPY(&tmp, CG(known_strings)[id]); \ Z_OBJ_HANDLER_P(object, unset_property)(object, &tmp, NULL); \ |