diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2002-10-26 19:33:15 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2002-10-26 19:33:15 +0000 |
| commit | 3a1c27836115898b735715df46765feed8abd677 (patch) | |
| tree | 9d3ca0cd0fff974cf55d8b02a8278d635a0a8ed2 /sapi/cli/php_cli.c | |
| parent | 467fea036a0978cd89e3bad0c668ffa1c903ac06 (diff) | |
| download | php-git-3a1c27836115898b735715df46765feed8abd677.tar.gz | |
Fixed memory leaks.
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 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; } /* }}} */ |