archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Don't leak header callback if headers already sent
This commit is contained in:
Nikita Popov 2021-09-16 15:31:39 +02:00
commit 0652e81041
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/SAPI.c
View file

@ -124,7 +124,11 @@ PHP_FUNCTION(header_register_callback)
SG(fci_cache) = empty_fcall_info_cache; SG(fci_cache) = empty_fcall_info_cache;
} }
/* Don't store callback if headers have already been sent:
* It won't get used and we won't have a chance to release it. */
if (!SG(headers_sent)) {
ZVAL_COPY(&SG(callback_func), &fci.function_name); ZVAL_COPY(&SG(callback_func), &fci.function_name);
}
RETURN_TRUE; RETURN_TRUE;
} }

9
tests/basic/header_register_callback_after_output.phpt Normal file
View file

@ -0,0 +1,9 @@
--TEST--
Call header_register_callback() after headers sent
--FILE--
<?php
echo "Send headers.\n";
header_register_callback(function() { echo "Too late";});
?>
--EXPECT--
Send headers.