moriyoshi Sat Dec 27 18:05:24 2003 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
- Add missing sanity check.
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.113 php-src/ext/iconv/iconv.c:1.114
--- php-src/ext/iconv/iconv.c:1.113 Tue Dec 23 21:36:21 2003
+++ php-src/ext/iconv/iconv.c Sat Dec 27 18:05:23 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.113 2003/12/24 02:36:21 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.114 2003/12/27 23:05:23 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2102,6 +2102,10 @@
break;
}
+ if (decoded_header.c != NULL) {
+ break;
+ }
+
limit = decoded_header.c + decoded_header.len;
for (p = decoded_header.c; p < limit; p++) {
if (*p == ':') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
