From 97202d9d8401ce88b65d604df1f45af43c9a04a1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 16 Oct 2020 17:23:10 +0200 Subject: Make sure output start filename is not freed early As filenames are no longer interned, we need to keep a reference to the zend_string to make sure it isn't freed. To avoid a nominal source compatibility break, create a new member in the globals. --- main/php_output.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'main/php_output.h') diff --git a/main/php_output.h b/main/php_output.h index 60f389b2b5..eba63e6039 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -137,9 +137,10 @@ ZEND_BEGIN_MODULE_GLOBALS(output) zend_stack handlers; php_output_handler *active; php_output_handler *running; - const char *output_start_filename; + const char *output_start_filename; /* TODO: Unused, remove */ int output_start_lineno; int flags; + zend_string *output_start_filename_str; ZEND_END_MODULE_GLOBALS(output) PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output) -- cgit v1.2.1