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

FPM: Fix possible double free on configuration load failure.

Browse source 
Closes #8948.
This commit is contained in:
Heiko Weber 2022-07-07 15:51:09 +02:00 • committed by David Carlier
parent 2e58e9e60f
commit bd6793372b
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -12,6 +12,7 @@ PHP NEWS
- FPM: - FPM:
. Fixed zlog message prepend, free on incorrect address. (Heiko Weber) . Fixed zlog message prepend, free on incorrect address. (Heiko Weber)
. Fixed possible double free on configuration loading failure. (Heiko Weber).
- GD: - GD:
. Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument). . Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument).

5
sapi/fpm/fpm/fpm_conf.c
View file

@ -1622,7 +1622,10 @@ int fpm_conf_load_ini_file(char *filename) /* {{{ */
tmp = zend_parse_ini_string(buf, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)fpm_conf_ini_parser, &error); tmp = zend_parse_ini_string(buf, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)fpm_conf_ini_parser, &error);
ini_filename = filename; ini_filename = filename;
if (error || tmp == FAILURE) { if (error || tmp == FAILURE) {
if (ini_include) free(ini_include); if (ini_include) {
free(ini_include);
ini_include = NULL;
}
ini_recursion--; ini_recursion--;
close(fd); close(fd);
free(buf); free(buf);