diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-07 15:50:44 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-07 15:50:44 +0400 |
| commit | 5aa91be509731eb46acff242412941325122ab03 (patch) | |
| tree | 4e34ad2a092564393fb453773199c1e914eb9edb /Zend/zend_exceptions.c | |
| parent | 6bf24f4dd01331122a0f10db392c08605f159826 (diff) | |
| download | php-git-5aa91be509731eb46acff242412941325122ab03.tar.gz | |
Simplify call-frame handling
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 0f59e254d7..90487bf762 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -119,7 +119,8 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */ zend_throw_exception_hook(exception TSRMLS_CC); } - if (EG(current_execute_data)->opline == NULL || + if (!EG(current_execute_data)->func || + !ZEND_USER_CODE(EG(current_execute_data)->func->common.type) || (EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) { /* no need to rethrow the exception */ return; |