diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-16 18:38:34 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-16 18:38:34 +0200 |
| commit | 9a669fa3d6e87eeca3d8e25d36d5bc30b96df0a5 (patch) | |
| tree | f69a60d190a7af7d8b920a70b447085d09923951 /main | |
| parent | d694e43c8656036b4d10eeebaa2fe90cb63c30e9 (diff) | |
| parent | d6a18a773899d07750b30082b5f5ce36aa3c70df (diff) | |
| download | php-git-9a669fa3d6e87eeca3d8e25d36d5bc30b96df0a5.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Properly handle NULL output start filename
Diffstat (limited to 'main')
| -rw-r--r-- | main/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/output.c b/main/output.c index a31ea9cfad..bdeca894f2 100644 --- a/main/output.c +++ b/main/output.c @@ -758,7 +758,7 @@ PHPAPI void php_output_set_implicit_flush(int flush) * Get the file name where output has started */ PHPAPI const char *php_output_get_start_filename(void) { - return ZSTR_VAL(OG(output_start_filename)); + return OG(output_start_filename) ? ZSTR_VAL(OG(output_start_filename)) : NULL; } /* }}} */ |