tony2001 Fri Sep 15 08:18:37 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cli php_cli.c
Log:
fix leak with `php -c /path -h`
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.7&r2=1.129.2.13.2.8&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.7
php-src/sapi/cli/php_cli.c:1.129.2.13.2.8
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.7 Tue Aug 22 12:04:53 2006
+++ php-src/sapi/cli/php_cli.c Fri Sep 15 08:18:36 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.7 2006/08/22 12:04:53 dmitry Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.8 2006/09/15 08:18:36 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -634,6 +634,7 @@
tsrm_startup(1, 1, 0, NULL);
#endif
+ cli_sapi_module.php_ini_path_override = NULL;
cli_sapi_module.ini_defaults = sapi_cli_ini_defaults;
cli_sapi_module.phpinfo_as_text = 1;
sapi_startup(&cli_sapi_module);
@@ -1246,9 +1247,6 @@
}
}
- if (cli_sapi_module.php_ini_path_override) {
- free(cli_sapi_module.php_ini_path_override);
- }
} zend_end_try();
out:
@@ -1259,6 +1257,9 @@
exit_status = EG(exit_status);
}
out_err:
+ if (cli_sapi_module.php_ini_path_override) {
+ free(cli_sapi_module.php_ini_path_override);
+ }
if (module_started) {
php_module_shutdown(TSRMLS_C);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
