clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed crash when calling sapi_shutdown() and sapi hasn't been started

Browse Source 
Reported by: David Tajchreber
This commit is contained in:
Felipe Pena 2011-06-25 14:17:17 +00:00
parent 9424d255c9
commit 7b1f738b70
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sapi/cli/php_cli.c
View File

@ -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