com php-src: Revert "Fixed bug #73067 (__debugInfo cras hes when throwing an exception)": NEWS Zend/t ests/bug73067.phpt Zend/zend_object_handlers .c

Commit: 6091873d4af0d0c5f187abf92e701ccb76d0a8b8 Author: Joe Watkins <krakjoe@php.net> Mon, 17 Oct 2016 14:22:55 +0100 Parents: 5fa76095bb310fac13f966f91a3b754b03b4f29b Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6091873d4af0d0c5f187abf92e701ccb76d0a8b8 Log: Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)" This reverts commit 2d8ab51576695630a7471ff829cc5ea10becdc0f. Bugs: https://bugs.php.net/73067 Changed paths: M NEWS D Zend/tests/bug73067.phpt M Zend/zend_object_handlers.c Diff: diff --git a/NEWS b/NEWS index 863c07b..0b87e6a 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 f5d34a8..0000000 --- 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 d57bee8..4341020 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... */