[PHP-CVS] cvs: php-src /main main.c

[Antony Dovgal]

tony2001                Thu Dec 28 12:01:14 2006 UTC

  Modified files:              
    /php-src/main       main.c 
  Log:
  use strlcat() and a bigger buffer
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.716&r2=1.717&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.716 php-src/main/main.c:1.717
--- php-src/main/main.c:1.716   Tue Dec 26 17:40:20 2006
+++ php-src/main/main.c Thu Dec 28 12:01:14 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.716 2006/12/26 17:40:20 iliaa Exp $ */
+/* $Id: main.c,v 1.717 2006/12/28 12:01:14 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -1070,7 +1070,7 @@
                case ZMSG_MEMORY_LEAK_REPEATED:
 #if ZEND_DEBUG
                        if (EG(error_reporting) & E_WARNING) {
-                               char memory_leak_buf[512];
+                               char memory_leak_buf[1024];
 
                                if (message==ZMSG_MEMORY_LEAK_DETECTED) {
                                        zend_leak_info *t = (zend_leak_info *) 
data;
@@ -1080,7 +1080,7 @@
                                                char relay_buf[512];
 
                                                snprintf(relay_buf, 512, 
"%s(%d) : Actual location (location was relayed)\n", t->orig_filename, 
t->orig_lineno);
-                                               strcat(memory_leak_buf, 
relay_buf);
+                                               strlcat(memory_leak_buf, 
relay_buf, sizeof(memory_leak_buf));
                                        }
                                } else {
                                        unsigned long leak_count = (unsigned 
long) data;

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