summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2016-12-07 15:10:59 +0300
committerDmitry Stogov <dmitry@zend.com>2016-12-07 15:12:18 +0300
commit3c8c347fa7c420035509324b764c0b38c2b71913 (patch)
tree95a004c4a7a5a3831ff9c6d70f45cfc413133be1 /Zend/zend_exceptions.c
parent991ca7f7d7965ed217c981941c23531dc75f735f (diff)
downloadphp-git-3c8c347fa7c420035509324b764c0b38c2b71913.tar.gz
Check if PHP is in execution state.
Diffstat (limited to 'Zend/zend_exceptions.c')
-rw-r--r--Zend/zend_exceptions.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index e0aa370bfe..bac9d34b05 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -186,7 +186,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