[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard head.c

[Ilia Alshanetsky]

iliaa           Wed Jan 24 00:45:54 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       head.c 
  Log:
  
  strcat() -> strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.84.2.1.2.3&r2=1.84.2.1.2.4&diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.84.2.1.2.3 
php-src/ext/standard/head.c:1.84.2.1.2.4
--- php-src/ext/standard/head.c:1.84.2.1.2.3    Mon Jan  1 09:36:08 2007
+++ php-src/ext/standard/head.c Wed Jan 24 00:45:54 2007
@@ -15,7 +15,7 @@
    | Author: Rasmus Lerdorf <[EMAIL PROTECTED]>                        |
    +----------------------------------------------------------------------+
  */
-/* $Id: head.c,v 1.84.2.1.2.3 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: head.c,v 1.84.2.1.2.4 2007/01/24 00:45:54 iliaa Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -111,7 +111,7 @@
                if (expires > 0) {
                        strcat(cookie, "; expires=");
                        dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, 
d-M-Y H:i:s T")-1, expires, 0 TSRMLS_CC);
-                       strcat(cookie, dt);
+                       strlcat(cookie, dt, len + 100);
                        efree(dt);
                }
        }
@@ -121,18 +121,18 @@
        }
 
        if (path && path_len > 0) {
-               strcat(cookie, "; path=");
-               strcat(cookie, path);
+               strlcat(cookie, "; path=", len + 100);
+               strlcat(cookie, path, len + 100);
        }
        if (domain && domain_len > 0) {
-               strcat(cookie, "; domain=");
-               strcat(cookie, domain);
+               strlcat(cookie, "; domain=", len + 100);
+               strlcat(cookie, domain, len + 100);
        }
        if (secure) {
-               strcat(cookie, "; secure");
+               strlcat(cookie, "; secure", len + 100);
        }
        if (httponly) {
-               strcat(cookie, "; httponly");
+               strlcat(cookie, "; httponly", len + 100);
        }
 
        ctr.line = cookie;

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