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

This reverts commit 2d8ab51576.
This commit is contained in:
Joe Watkins 2016-10-17 14:22:55 +01:00
parent 5fa76095bb
commit 6091873d4a
3 changed files with 0 additions and 24 deletions

2
NEWS
View File

@ -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)

View File

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

View File

@ -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... */