From: Antony Dovgal <tony2001@php.net>
Date: Fri, 15 Sep 2006 08:18:36 +0000 (+0000)
Subject: fix leak with `php -c /path -h`
X-Git-Tag: php-5.2.0RC5~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b257a1c0e4af80a162727789e595b6d77e136ae;p=php

fix leak with `php -c /path -h`
---

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 63e0314b16..27d278cb5a 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -634,6 +634,7 @@ int main(int argc, char *argv[])
 	tsrm_startup(1, 1, 0, NULL);
 #endif
 
+	cli_sapi_module.php_ini_path_override = NULL;
 	cli_sapi_module.ini_defaults = sapi_cli_ini_defaults;
 	cli_sapi_module.phpinfo_as_text = 1;
 	sapi_startup(&cli_sapi_module);
@@ -1246,9 +1247,6 @@ int main(int argc, char *argv[])
 			}
 		}
 
-		if (cli_sapi_module.php_ini_path_override) {
-			free(cli_sapi_module.php_ini_path_override);
-		}
 	} zend_end_try();
 
 out:
@@ -1259,6 +1257,9 @@ out:
 		exit_status = EG(exit_status);
 	}
 out_err:	
+	if (cli_sapi_module.php_ini_path_override) {
+		free(cli_sapi_module.php_ini_path_override);
+	}
 	if (module_started) {
 		php_module_shutdown(TSRMLS_C);
 	}