diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 11:00:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 11:00:23 +0200 |
| commit | 105300afe497530c96ea5bdce215ae5571cd619a (patch) | |
| tree | bc81187562497fe5052a40fb53e12782dc118906 /Zend/zend_execute_API.c | |
| parent | fa1a03f7a2fb62d44180a91f13409d21a9ba0672 (diff) | |
| parent | 2bf880db2c624a32f130e0da309b22dcf782609d (diff) | |
| download | php-git-105300afe497530c96ea5bdce215ae5571cd619a.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 1bd462712d..a3dfac39a6 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -722,6 +722,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / zend_vm_stack_free_call_frame(call); if (EG(current_execute_data) == &dummy_execute_data) { EG(current_execute_data) = dummy_execute_data.prev_execute_data; + zend_rethrow_exception(EG(current_execute_data)); } return FAILURE; } |