Skip to content

Commit aaa2443

Browse files
ericnorrisnielsdos
andcommitted
move initialization of error_backtrace to handle NTS
Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
1 parent 2cd6c3f commit aaa2443

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Zend/zend.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,6 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
812812
executor_globals->in_autoload = NULL;
813813
executor_globals->current_execute_data = NULL;
814814
executor_globals->current_module = NULL;
815-
ZVAL_UNDEF(&executor_globals->error_backtrace);
816815
executor_globals->exit_status = 0;
817816
#if XPFPA_HAVE_CW
818817
executor_globals->saved_fpu_cw = 0;

Zend/zend_execute_API.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ void init_executor(void) /* {{{ */
140140
original_sigsegv_handler = signal(SIGSEGV, zend_handle_sigsegv);
141141
#endif
142142

143+
ZVAL_UNDEF(&EG(error_backtrace));
144+
143145
EG(symtable_cache_ptr) = EG(symtable_cache);
144146
EG(symtable_cache_limit) = EG(symtable_cache) + SYMTABLE_CACHE_SIZE;
145147
EG(no_extensions) = 0;

0 commit comments

Comments
 (0)