sniper          Tue Apr 17 19:46:14 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/cli   php_cli.c 
  Log:
  - Fix a possible leak when multiple -c parameters are used
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.16&r2=1.129.2.13.2.17&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.16 
php-src/sapi/cli/php_cli.c:1.129.2.13.2.17
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.16  Thu Feb 22 10:06:22 2007
+++ php-src/sapi/cli/php_cli.c  Tue Apr 17 19:46:13 2007
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.16 2007/02/22 10:06:22 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.17 2007/04/17 19:46:13 sniper Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -652,7 +652,10 @@
        while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 
0))!=-1) {
                switch (c) {
                        case 'c':
-                               cli_sapi_module.php_ini_path_override = 
strdup(php_optarg);
+                               if (cli_sapi_module.php_ini_path_override) {
+                                       
free(cli_sapi_module.php_ini_path_override);
+                               }
+                               cli_sapi_module.php_ini_path_override = 
strdup(php_optarg);
                                break;
                        case 'n':
                                cli_sapi_module.php_ini_ignore = 1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to