diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-13 11:17:50 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-13 11:17:50 +0400 |
| commit | af66b207816e29bd7e8e8798ef438cfe53b5521e (patch) | |
| tree | c4de5c79d384242a8b3bbed81d028054e42154ac /Zend/zend_execute.c | |
| parent | 3bddcc13b5c9f6aa0cf6113b8009c621b7867fd5 (diff) | |
| parent | 6f95a07c411fa78092427c6edd2d867d0f085b73 (diff) | |
| download | php-git-af66b207816e29bd7e8e8798ef438cfe53b5521e.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
Use zend_error_noreturn here
OCI8 build change: Fix source variable definition for C89 compatibility
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
Fixed bug #65784 (Segfault with finally).
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 5aea39ea94..5c6d3e780b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1650,6 +1650,7 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array EX(call) = NULL; EG(current_execute_data) = execute_data; EX(nested) = nested; + EX(delayed_exception) = NULL; if (!op_array->run_time_cache && op_array->last_cache_slot) { op_array->run_time_cache = ecalloc(op_array->last_cache_slot, sizeof(void*)); |