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

laruence · laruence · commit a8368ddc38a1 · 2015-09-10T19:56:13.000+08:00
diff --git a/NEWS b/NEWS
@@ -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)
 
diff --git a/main/php_ini.c b/main/php_ini.c
@@ -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));
 		}

Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,6 @@ int php_init_config(void)`
`553`	`553`	`fh.handle.fp = VCWD_FOPEN(php_ini_file_name, "r");`
`554`	`554`	`if (fh.handle.fp) {`
`555`	`555`	`fh.filename = expand_filepath(php_ini_file_name, NULL);`
`556`		`- opened_path = zend_string_init(fh.filename, strlen(fh.filename), 0);`
`557`	`556`	`}`
`558`	`557`	`}`
`559`	`558`	`}`
`@@ -599,6 +598,8 @@ int php_init_config(void)`
`599`	`598`	`zend_hash_str_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path")-1, &tmp);`
`600`	`599`	`if (opened_path) {`
`601`	`600`	`zend_string_release(opened_path);`
	`601`	`+ } else {`
	`602`	`+ efree((char *)fh.filename);`
`602`	`603`	`}`
`603`	`604`	`php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));`
`604`	`605`	`}`