diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-12-07 15:13:00 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-12-07 15:13:00 +0300 |
| commit | 000d4a1a1b251e8420ca238b699cc847bc9fc63a (patch) | |
| tree | 99dc29ed406c6b25c43a90483b46755bddf35d94 /Zend/zend_exceptions.c | |
| parent | c2bc94f5a5c61d5e01208f41ad0de13b538504a9 (diff) | |
| parent | ee15891c35711ee5fb97aeed04a20db2684888db (diff) | |
| download | php-git-000d4a1a1b251e8420ca238b699cc847bc9fc63a.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Check if PHP is in execution state.
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index bf884c1f94..0aaca540fb 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -190,7 +190,9 @@ ZEND_API void zend_clear_exception(void) /* {{{ */ } OBJ_RELEASE(EG(exception)); EG(exception) = NULL; - EG(current_execute_data)->opline = EG(opline_before_exception); + if (EG(current_execute_data)) { + EG(current_execute_data)->opline = EG(opline_before_exception); + } #if ZEND_DEBUG EG(opline_before_exception) = NULL; #endif |