moriyoshi Mon Jan 6 10:40:22 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Added more RFC2047-compliancy check in iconv_mime_decode()
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.78 php4/ext/iconv/iconv.c:1.79
--- php4/ext/iconv/iconv.c:1.78 Mon Jan 6 10:35:42 2003
+++ php4/ext/iconv/iconv.c Mon Jan 6 10:40:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.78 2003/01/06 15:35:42 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.79 2003/01/06 15:40:22 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1459,6 +1459,11 @@
}
break;
}
+ }
+
+ if (scan_stat != 0) {
+ err = PHP_ICONV_ERR_MALFORMED;
+ goto out;
}
if (cd != (iconv_t)(-1)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
