sniper Tue Apr 17 20:00:53 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
Log:
- Fix a possible leak when multiple -c parameters are used
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.35&r2=1.267.2.15.2.36&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.35
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.36
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.35 Tue Apr 17 18:51:34 2007
+++ php-src/sapi/cgi/cgi_main.c Tue Apr 17 20:00:53 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.35 2007/04/17 18:51:34 tony2001 Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.36 2007/04/17 20:00:53 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1151,6 +1151,7 @@
#endif
sapi_startup(&cgi_sapi_module);
+ cgi_sapi_module.php_ini_path_override = NULL;
#ifdef PHP_WIN32
_fmode = _O_BINARY; /* sets default for file streams to binary */
@@ -1178,6 +1179,9 @@
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind,
0)) != -1) {
switch (c) {
case 'c':
+ if (cgi_sapi_module.php_ini_path_override) {
+
free(cgi_sapi_module.php_ini_path_override);
+ }
cgi_sapi_module.php_ini_path_override =
strdup(php_optarg);
break;
case 'n':
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
