[PHP-CVS] cvs: php-src /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c

[Antony Dovgal]

tony2001                Thu Dec 28 13:30:18 2006 UTC

  Modified files:              
    /php-src/sapi/apache        php_apache.c 
    /php-src/sapi/apache_hooks  php_apache.c 
  Log:
  use strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.98 
php-src/sapi/apache/php_apache.c:1.99
--- php-src/sapi/apache/php_apache.c:1.98       Wed Sep 27 18:18:59 2006
+++ php-src/sapi/apache/php_apache.c    Thu Dec 28 13:30:18 2006
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.98 2006/09/27 18:18:59 derick Exp $ */
+/* $Id: php_apache.c,v 1.99 2006/12/28 13:30:18 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -235,9 +235,9 @@
                if ((p = strrchr(name, '.'))) {
                        *p='\0'; /* Cut off ugly .c extensions on module names 
*/
                }
-               strcat(modulenames, name);
+               strlcat(modulenames, name, sizeof(modulenames));
                if (modp->next) {
-                       strcat(modulenames, ", ");
+                       strlcat(modulenames, ", ", sizeof(modulenames));
                }
        }
        php_info_print_table_row(2, "Loaded Modules", modulenames);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.26 
php-src/sapi/apache_hooks/php_apache.c:1.27
--- php-src/sapi/apache_hooks/php_apache.c:1.26 Wed Sep  6 11:55:12 2006
+++ php-src/sapi/apache_hooks/php_apache.c      Thu Dec 28 13:30:18 2006
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.26 2006/09/06 11:55:12 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.27 2006/12/28 13:30:18 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -1637,9 +1637,9 @@
                if ((p = strrchr(name, '.'))) {
                        *p='\0'; /* Cut off ugly .c extensions on module names 
*/
                }
-               strcat(modulenames, name);
+               strlcat(modulenames, name, sizeof(modulenames));
                if (modp->next) {
-                       strcat(modulenames, ", ");
+                       strlcat(modulenames, ", ", sizeof(modulenames));
                }
        }
        php_info_print_table_row(2, "Loaded Modules", modulenames);

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