]> granicus.if.org Git - php/commitdiff
call sapi_deactivate() & friends on error
authorAntony Dovgal <tony2001@php.net>
Fri, 24 Nov 2006 11:54:48 +0000 (11:54 +0000)
committerAntony Dovgal <tony2001@php.net>
Fri, 24 Nov 2006 11:54:48 +0000 (11:54 +0000)
fixes leak with `php-cli -n -c ..`

sapi/cli/php_cli.c

index 9e8e26e3744a49c271dd6eabb7190952c8219a71..2793494b839a59c274e20676aa049f6070042bc2 100644 (file)
@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
                if (cli_sapi_module.php_ini_path_override && cli_sapi_module.php_ini_ignore) {
                        PUTS("You cannot use both -n and -c switch. Use -h for help.\n");
                        exit_status=1;
-                       goto out_err;
+                       goto err;
                }
 
                while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0)) != -1) {