Fixed bug #70431 (Memory leak in php_ini.c)

This commit is contained in:
Xinchen Hui 2015-09-10 19:53:37 +08:00
parent 66643f6192
commit a8368ddc38
2 changed files with 5 additions and 1 deletions

3
NEWS
View File

@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
17 Sep 2015, PHP 7.0.0 RC 3
- Core:
. Fixed bug #70431 (Memory leak in php_ini.c). (Sixed, Laruence)
- CLI server:
. Fixed bug #68291 (404 on urls with '+'). (cmb)

View File

@ -553,7 +553,6 @@ int php_init_config(void)
fh.handle.fp = VCWD_FOPEN(php_ini_file_name, "r");
if (fh.handle.fp) {
fh.filename = expand_filepath(php_ini_file_name, NULL);
opened_path = zend_string_init(fh.filename, strlen(fh.filename), 0);
}
}
}
@ -599,6 +598,8 @@ int php_init_config(void)
zend_hash_str_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path")-1, &tmp);
if (opened_path) {
zend_string_release(opened_path);
} else {
efree((char *)fh.filename);
}
php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
}