Merge branch 'PHP-7.2'

Author: nikic

NEWS

@@ -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)
 
 - FPM:
   . Fixed bug #73342 (Vulnerability in php-fpm by changing stdin to

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

Zend/zend_exceptions.c

@@ -325,7 +325,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);
 	}