Skip to content

Commit ec68d3c

Browse files
committed
Properly initialize _override executor globals
These have been introduced a while ago[1], but their initialization has been overlooked. Since we cannot rely on TLS variables to be zeroed, we catch up on this. [1] <php@e3ef7bb> Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com> Closes phpGH-16658.
1 parent c9eafc1 commit ec68d3c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Zend/zend.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,8 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
803803
executor_globals->record_errors = false;
804804
executor_globals->num_errors = 0;
805805
executor_globals->errors = NULL;
806+
executor_globals->filename_override = NULL;
807+
executor_globals->lineno_override = -1;
806808
#ifdef ZEND_MAX_EXECUTION_TIMERS
807809
executor_globals->pid = 0;
808810
executor_globals->oldact = (struct sigaction){0};

0 commit comments

Comments
 (0)