diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Zend/tests/bug73337.phpt | 12 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
3 files changed, 19 insertions, 1 deletions
@@ -15,6 +15,9 @@ PHP NEWS (Laruence) . Fixed for #73240 (Write out of bounds at number_format). (Stas) . Fix pthreads detection when cross-compiling (ffontaine) + . Fixed bug #73215 (uniqid() should use better random source). (Yasuo) + . Fixed bug #73337 (try/catch not working with two exceptions inside a same + operation). (Dmitry) - BCmath: . Fix bug #73190 (memcpy negative parameter _bc_new_num_ex). (Stas) diff --git a/Zend/tests/bug73337.phpt b/Zend/tests/bug73337.phpt new file mode 100644 index 0000000000..9eff18e643 --- /dev/null +++ b/Zend/tests/bug73337.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #73337 (try/catch not working with two exceptions inside a same operation) +--FILE-- +<?php +class d { function __destruct() { throw new Exception; } } +try { new d + new d; } catch (Exception $e) { print "Exception properly caught\n"; } +?> +--EXPECTF-- +Notice: Object of class d could not be converted to int in %sbug73337.php on line 3 + +Notice: Object of class d could not be converted to int in %sbug73337.php on line 3 +Exception properly caught diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 2e299e8515..fc4a39acb6 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -820,10 +820,13 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / ZEND_ADD_CALL_FLAG(call, ZEND_CALL_CLOSURE); } - if (func->type == ZEND_USER_FUNCTION) { + if (func->type == ZEND_USER_FUNCTION) { int call_via_handler = (func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) != 0; + const zend_op *current_opline_before_exception = EG(opline_before_exception); + zend_init_execute_data(call, &func->op_array, fci->retval); zend_execute_ex(call); + EG(opline_before_exception) = current_opline_before_exception; if (call_via_handler) { /* We must re-initialize function again */ fci_cache->initialized = 0; |