From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 13:22:55 +0000 (+0100)
Subject: Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
X-Git-Tag: php-7.1.0RC5~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6091873d4af0d0c5f187abf92e701ccb76d0a8b8;p=php

Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"

This reverts commit 2d8ab51576695630a7471ff829cc5ea10becdc0f.
---

diff --git a/NEWS b/NEWS
index 863c07b860..0b87e6a7cb 100644
--- a/NEWS
+++ b/NEWS
@@ -133,8 +133,6 @@ PHP                                                                        NEWS
 15 Sep 2016, PHP 7.1.0RC2
 
 - Core:
-  . Fixed bug #73067 (__debugInfo crashes when throwing an exception).
-    (Laruence)
   . Fixed bug #73025 (Heap Buffer Overflow in virtual_popen of
     zend_virtual_cwd.c). (cmb)
   . Fixed bug #73058 (crypt broken when salt is 'too' long). (Anatol)
diff --git a/Zend/tests/bug73067.phpt b/Zend/tests/bug73067.phpt
deleted file mode 100644
index f5d34a8d87..0000000000
--- a/Zend/tests/bug73067.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Bug #73067 (__debugInfo crashes when throwing an exception)
---FILE--
-<?php
-
-class Debug
-{
-	public function __debugInfo()
-	{
-		throw new Exception("Test Crash");
-	}
-}
-
-try {
-	var_dump(new Debug());
-} catch (Exception $e) {
-	echo $e->getMessage();
-}
-?>
---EXPECTF--
-Fatal error: __debuginfo() must return an array in %sbug73067.php on line %d
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index d57bee862a..434102035c 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -182,7 +182,6 @@ ZEND_API HashTable *zend_std_get_debug_info(zval *object, int *is_temp) /* {{{ *
 		return ht;
 	}
 
-	zend_clear_exception();
 	zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
 
 	return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */