cvs: php-src(PHP_5_2) /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Mon, 25 Dec 2006 20:44:45 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42379@lists.php.net to get a copy of this message | ||
tony2001 Mon Dec 25 20:44:45 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/iconv iconv.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.9&r2=1.124.2.8.2.10&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.9 php-src/ext/iconv/iconv.c:1.124.2.8.2.10
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.9 Wed Dec 20 10:34:36 2006
+++ php-src/ext/iconv/iconv.c Mon Dec 25 20:44:45 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.9 2006/12/20 10:34:36 bjori Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.10 2006/12/25 20:44:45 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1040,7 +1040,7 @@
goto out;
}
- buf = emalloc(max_line_len + 5);
+ buf = safe_emalloc(1, max_line_len, 5);
char_cnt = max_line_len;