diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-24 22:28:49 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-24 22:28:57 +0200 |
| commit | 14b22704c7cf3b8d42b08cb3e5d387ef6a962e12 (patch) | |
| tree | f9fd5ec56c316ec264e178373400dad4b7490acb | |
| parent | ed9d1b708bb83d4819648815a35da96be38ef437 (diff) | |
| parent | 701460ba84865be03df81265a6c6d76f40dd6b00 (diff) | |
| download | php-git-14b22704c7cf3b8d42b08cb3e5d387ef6a962e12.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/tests/bug76502.phpt | 36 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
3 files changed, 39 insertions, 1 deletions
@@ -5,6 +5,8 @@ PHP NEWS - Core: . Fixed bug #76520 (Object creation leaks memory when executed over HTTP). (Nikita) + . Fixed bug #76502 (Chain of mixed exceptions and errors does not serialize + properly). (Nikita) - Date: . Fixed bug #76462 (Undefined property: DateInterval::$f). (Anatol) diff --git a/Zend/tests/bug76502.phpt b/Zend/tests/bug76502.phpt new file mode 100644 index 0000000000..caacc99f70 --- /dev/null +++ b/Zend/tests/bug76502.phpt @@ -0,0 +1,36 @@ +--TEST-- +Bug #76502: Chain of mixed exceptions and errors does not serialize properly +--FILE-- +<?php + +$examples = [ + "Exception(Exception())" => new Exception("outer", 0, new Exception("inner")), + "Error(Error())" => new Error("outer", 0, new Error("inner")), + "Error(Exception())" => new Error("outer", 0, new Exception("inner")), + "Exception(Error())" => new Exception("outer", 0, new Error("inner")) +]; + +foreach ($examples as $name => $example) { + $processed = unserialize(serialize($example)); + $processedPrev = $processed->getPrevious(); + echo "---- $name ----\n"; + echo "before: ", get_class($example), ".previous == ", + get_class($example->getPrevious()), "\n"; + echo "after : ", get_class($processed), ".previous == ", + $processedPrev ? get_class($processedPrev) : "null", "\n"; +} + +?> +--EXPECT-- +---- Exception(Exception()) ---- +before: Exception.previous == Exception +after : Exception.previous == Exception +---- Error(Error()) ---- +before: Error.previous == Error +after : Error.previous == Error +---- Error(Exception()) ---- +before: Error.previous == Exception +after : Error.previous == Exception +---- Exception(Error()) ---- +before: Exception.previous == Error +after : Exception.previous == Error diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index f54158d707..b4deb29a72 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -323,7 +323,7 @@ ZEND_METHOD(exception, __wakeup) CHECK_EXC_TYPE(ZEND_STR_TRACE, IS_ARRAY); pvalue = zend_read_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1, 1, &value); if (pvalue && Z_TYPE_P(pvalue) != IS_NULL && (Z_TYPE_P(pvalue) != IS_OBJECT || - !instanceof_function(Z_OBJCE_P(pvalue), i_get_exception_base(object)) || + !instanceof_function(Z_OBJCE_P(pvalue), zend_ce_throwable) || pvalue == object)) { zend_unset_property(i_get_exception_base(object), object, "previous", sizeof("previous")-1); } |