moriyoshi Fri Jan 3 00:34:06 2003 EDT Modified files: /php4/ext/iconv iconv.c Log: Fixed infinite loop of iconv_mime_encode() in case the specified line length is too short to contain a proper mime-encoded string Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.72 php4/ext/iconv/iconv.c:1.73 --- php4/ext/iconv/iconv.c:1.72 Fri Jan 3 00:32:13 2003 +++ php4/ext/iconv/iconv.c Fri Jan 3 00:34:05 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.72 2003/01/03 05:32:13 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.73 2003/01/03 05:34:05 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1077,6 +1077,10 @@ goto out; case E2BIG: + if (prev_in_left == +in_left) { + err = +PHP_ICONV_ERR_TOO_BIG; + goto out; + } break; default:
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php