From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 3 Jan 2003 05:34:05 +0000 (+0000)
Subject: Fixed infinite loop of iconv_mime_encode() in case the specified line length is too... 
X-Git-Tag: PHP_5_0_dev_before_13561_fix~511
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1dd919204322436e72e698051c6f1bd70f01b29;p=php

Fixed infinite loop of iconv_mime_encode() in case the specified line length is too short to contain a proper mime-encoded string
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index b5f95cf1b8..00a3d20494 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1077,6 +1077,10 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn
 								goto out;
 
 							case E2BIG:
+								if (prev_in_left == in_left) {
+									err = PHP_ICONV_ERR_TOO_BIG;
+									goto out;
+								}
 								break;
 
 							default: