Added more RFC2047-compliancy check in iconv_mime_decode()

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 5347ccbe968ff7a5d3640fd166290f50d731d75e..acb1347a5f0858fd937f5372f810598101ceeb47 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1461,6 +1461,11 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st
                }
        }
 
+       if (scan_stat != 0) {
+               err = PHP_ICONV_ERR_MALFORMED;
+               goto out;
+       }
+
        if (cd != (iconv_t)(-1)) {
                if ((err = _php_iconv_appendl(pretval, NULL, 0, cd)) != PHP_ICONV_ERR_SUCCESS) {
                        goto out;