diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-10-18 15:09:44 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-10-18 15:09:44 +0300 |
| commit | c31d66b3fdab3c7ab8e71ef7e02f90421851a495 (patch) | |
| tree | e0c9b178c90c31243c4c7d810ffc9fd0b63daacb /Zend/zend_execute_API.c | |
| parent | 689cf8b2666e0bc9dff5c9216fedbf491890d3da (diff) | |
| parent | 7bd4e7208e26e3e441717c0f33a154a385764d06 (diff) | |
| download | php-git-c31d66b3fdab3c7ab8e71ef7e02f90421851a495.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
Update NEWS
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |