diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-10-18 14:48:01 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-10-18 14:48:01 +0300 |
| commit | 6558559bcc1cd24e3639e4a215e9d546ee05fc48 (patch) | |
| tree | e9e153cb4f4f1d03f04b32b33d66ccc50519f499 | |
| parent | 86e603a664afdc3a12ead0eaca5d37fa8a379381 (diff) | |
| download | php-git-6558559bcc1cd24e3639e4a215e9d546ee05fc48.tar.gz | |
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | Zend/tests/bug73337.phpt | 12 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 3 |
3 files changed, 19 insertions, 0 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2016, PHP 5.6.28 +- Core: + . Fixed bug #73337 (try/catch not working with two exceptions inside a same + operation). (Dmitry) + -GD: . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb) . Fixed bug #73272 (imagescale() is not affected by, but affects 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 7eeece37d0..bf754d25df 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -826,7 +826,10 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS if (EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) { *fci->retval_ptr_ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC); } else { + const zend_op *current_opline_before_exception = EG(opline_before_exception); + zend_execute(EG(active_op_array) TSRMLS_CC); + EG(opline_before_exception) = current_opline_before_exception; } if (!fci->symbol_table && EG(active_symbol_table)) { |