diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-05-25 01:25:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-05-25 01:25:12 +0300 |
| commit | 2ae21abdf7b87ee95d76aca22e787408d7c766cf (patch) | |
| tree | 26c8c6ba8f81f077c10cd5031b3d8b79ecdaa064 /Zend/tests/bug65784.phpt | |
| parent | 91f5940329fede8a26b64e99d4d6d858fe8654cc (diff) | |
| download | php-git-2ae21abdf7b87ee95d76aca22e787408d7c766cf.tar.gz | |
Fixed bug #72213 (Finally leaks on nested exceptions).
Squashed commit of the following:
commit 8461b0407fc9eab0869d43b84e6a92ba2fe06997
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed May 25 00:34:42 2016 +0300
Rmoved zend_try_catch_element.parent and walk through op_array.try_catch_array backward from the current try_cacth_offset.
commit 0c71e249649bed178bfbef30bb3e63c57f07af05
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed May 25 00:04:53 2016 +0300
Move SAVE_OPLINE() to its original place
commit 111432a4df738fcd65878a42f23194dc3c4983a2
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed May 25 00:01:10 2016 +0300
Separate the common part of ZEND_HANDLE_EXCEPTION and FAST_RET into zend_dispatch_try_catch_finally_helper.
commit 4f21c06c2ec17819a708bc037f318784554a6ecd
Author: Nikita Popov <nikic@php.net>
Date: Tue May 24 14:55:27 2016 +0200
Improve finally fix
commit da5c7274997b8308e682b5bf280124e3a1483086
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 10:36:08 2016 +0300
Fixed Zend/tests/try/bug70228_3.phpt and Zend/tests/try/bug70228_4.phpt
commit cfcedf2fb4f4fc1f7de9f7d53a3037fed7795f19
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 02:59:27 2016 +0300
Added test
commit 4c6aa93d43da941eb4fda15b48154bfb104bdc04
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 00:38:20 2016 +0300
Added tests
commit 8a8f4704b0eca2e460d42c1f253a363b0db8e510
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon May 23 23:27:34 2016 +0300
Fixed bug #72213 (Finally leaks on nested exceptions)
Diffstat (limited to 'Zend/tests/bug65784.phpt')
| -rw-r--r-- | Zend/tests/bug65784.phpt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Zend/tests/bug65784.phpt b/Zend/tests/bug65784.phpt index c079b3d282..397c52aef9 100644 --- a/Zend/tests/bug65784.phpt +++ b/Zend/tests/bug65784.phpt @@ -57,8 +57,13 @@ $bar = foo3(); string(9) "not catch" NULL -Fatal error: Uncaught Error: Class 'NotExists' not found in %sbug65784.php:%d +Fatal error: Uncaught Exception: not catched in %sbug65784.php:42 Stack trace: -#0 %s(%d): foo3() +#0 %sbug65784.php(52): foo3() #1 {main} - thrown in %sbug65784.php on line %d + +Next Error: Class 'NotExists' not found in %s/bug65784.php:46 +Stack trace: +#0 %sbug65784.php(52): foo3() +#1 {main} + thrown in %sbug65784.php on line 46 |