archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  Check if PHP is in execution state.
This commit is contained in:
Dmitry Stogov 2016-12-07 15:13:00 +03:00
commit 000d4a1a1b
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_exceptions.c
View file

@ -190,7 +190,9 @@ ZEND_API void zend_clear_exception(void) /* {{{ */
} }
OBJ_RELEASE(EG(exception)); OBJ_RELEASE(EG(exception));
EG(exception) = NULL; 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 #if ZEND_DEBUG
EG(opline_before_exception) = NULL; EG(opline_before_exception) = NULL;
#endif #endif