From ec68d3c6083bb4ce92b63ba969047e151c8a6019 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Thu, 31 Oct 2024 22:56:42 +0100
Subject: [PATCH] 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] <https://github.com/php/php-src/commit/e3ef7bbbb87bcbf6154a0a4854127b9cea8f92ff>

Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>

Closes GH-16658.
---
 Zend/zend.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Zend/zend.c b/Zend/zend.c
index 097018bf8bf73..d14b90a8d9cc1 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -803,6 +803,8 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
 	executor_globals->record_errors = false;
 	executor_globals->num_errors = 0;
 	executor_globals->errors = NULL;
+	executor_globals->filename_override = NULL;
+	executor_globals->lineno_override = -1;
 #ifdef ZEND_MAX_EXECUTION_TIMERS
 	executor_globals->pid = 0;
 	executor_globals->oldact = (struct sigaction){0};