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

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 63e0314b16f8f4ca81a91d3a7c9b65d58e1791d6..27d278cb5a596e03a5d35e32be7867ddc3c67dcc 100644 (file)
--- 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);
        }