Skip to content

Commit 000d4a1

Browse files
committed
Merge branch 'PHP-7.1'
* PHP-7.1: Check if PHP is in execution state.
2 parents c2bc94f + ee15891 commit 000d4a1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Zend/zend_exceptions.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ ZEND_API void zend_clear_exception(void) /* {{{ */
190190
}
191191
OBJ_RELEASE(EG(exception));
192192
EG(exception) = NULL;
193-
EG(current_execute_data)->opline = EG(opline_before_exception);
193+
if (EG(current_execute_data)) {
194+
EG(current_execute_data)->opline = EG(opline_before_exception);
195+
}
194196
#if ZEND_DEBUG
195197
EG(opline_before_exception) = NULL;
196198
#endif

0 commit comments

Comments
 (0)