From: Felipe Pena <felipe@php.net>
Date: Sat, 25 Jun 2011 14:17:17 +0000 (+0000)
Subject: - Fixed crash when calling sapi_shutdown() and sapi hasn't been started
X-Git-Tag: php-5.5.0alpha1~1870
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b1f738b70ad148152d671f982aafda02528692b;p=php

- Fixed crash when calling sapi_shutdown() and sapi hasn't been started
Reported by: David Tajchreber
---

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index cdce836445..14ac439a86 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -1194,7 +1194,7 @@ int main(int argc, char *argv[])
 #endif
 	int c;
 	int exit_status = SUCCESS;
-	int module_started = 0;
+	int module_started = 0, sapi_started = 0;
 	char *php_optarg = NULL;
 	int php_optind = 1;
 	char *ini_path_override = NULL;
@@ -1312,6 +1312,7 @@ exit_loop:
 	sapi_module->phpinfo_as_text = 1;
 	sapi_module->php_ini_ignore_cwd = 1;
 	sapi_startup(sapi_module);
+	sapi_started = 1;
 
 	sapi_module->php_ini_ignore = ini_ignore;
 
@@ -1364,7 +1365,9 @@ out:
 	if (module_started) {
 		php_module_shutdown(TSRMLS_C);
 	}
-	sapi_shutdown();
+	if (sapi_started) {
+		sapi_shutdown();
+	}
 #ifdef ZTS
 	tsrm_shutdown();
 #endif