diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-16 17:29:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-16 17:29:22 +0200 |
| commit | 808029c0498010b4b56cceb06276a9b0b6050587 (patch) | |
| tree | f0ac012ec8a17b21f4465ec1659846682eab14fd /main/php_output.h | |
| parent | 60ece88c28494945c9067448e8f9c4eeb18f8aff (diff) | |
| parent | 97202d9d8401ce88b65d604df1f45af43c9a04a1 (diff) | |
| download | php-git-808029c0498010b4b56cceb06276a9b0b6050587.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Make sure output start filename is not freed early
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 3 |
1 files changed, 2 insertions, 1 deletions
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) |