iliaa           Mon Feb 19 23:52:13 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/cgi   cgi_main.c 
  Log:
  
  Fixed strlcat() usage.
  
  # Thanks Andi
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.25&r2=1.267.2.15.2.26&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.25 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.26
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.25 Mon Feb 19 14:13:02 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Feb 19 23:52:13 2007
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.25 2007/02/19 14:13:02 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.26 2007/02/19 23:52:13 iliaa Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1636,7 +1636,8 @@
                                        }
                                }
 
-                               s = malloc(++len + 1);
+                               len += 2;
+                               s = malloc(len);
                                *s = '\0';                      /* we are 
pretending it came from the environment  */
                                for (i = php_optind; i < argc; i++) {
                                        strlcat(s, argv[i], len);

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

Reply via email to