diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-09-15 08:18:36 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-09-15 08:18:36 +0000 |
| commit | 4b257a1c0e4af80a162727789e595b6d77e136ae (patch) | |
| tree | f7aef4e9532603045b48926b559b4ea8e57d64f5 /sapi/cli/php_cli.c | |
| parent | 55d900ef8e1940046762e0d38db9d59a7c191d6d (diff) | |
| download | php-git-4b257a1c0e4af80a162727789e595b6d77e136ae.tar.gz | |
fix leak with `php -c /path -h`
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 7 |
1 files changed, 4 insertions, 3 deletions
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); } |