diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-12-07 15:12:48 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-12-07 15:12:48 +0300 |
| commit | ee15891c35711ee5fb97aeed04a20db2684888db (patch) | |
| tree | 5d9d463ec6fb7c9715ed2c4c95ebe3f280e4af03 /Zend/zend_exceptions.c | |
| parent | 76c4a3db080e347663a3999ae38b78cf26dd4c84 (diff) | |
| parent | 3c8c347fa7c420035509324b764c0b38c2b71913 (diff) | |
| download | php-git-ee15891c35711ee5fb97aeed04a20db2684888db.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 8f41e1ce71..7561e8ca45 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 |