Fixed infinite loop of iconv_mime_encode() in case the specified line length is too...

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index b5f95cf1b845bef5642d71476cd28e46f2d63ce0..00a3d204941ce1ddc35791f4ef81410495a35527 100644 (file)
--- 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: