From 3a1c27836115898b735715df46765feed8abd677 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sat, 26 Oct 2002 19:33:15 +0000 Subject: Fixed memory leaks. --- sapi/cli/php_cli.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sapi/cli/php_cli.c') diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index c96d2d56a3..60a560c8dd 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -740,8 +740,6 @@ int main(int argc, char *argv[]) break; } - php_request_shutdown((void *) 0); - if (cli_sapi_module.php_ini_path_override) { free(cli_sapi_module.php_ini_path_override); } @@ -751,6 +749,8 @@ int main(int argc, char *argv[]) } zend_end_try(); out: + php_request_shutdown((void *) 0); +out_err: if (module_started) { php_module_shutdown(TSRMLS_C); } @@ -762,8 +762,9 @@ out: exit(exit_status); err: + zend_ini_deactivate(TSRMLS_C); exit_status = 1; - goto out; + goto out_err; } /* }}} */ -- cgit v1.2.1