From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 6 Jan 2003 15:40:22 +0000 (+0000)
Subject: Added more RFC2047-compliancy check in iconv_mime_decode()
X-Git-Tag: PHP_5_0_dev_before_13561_fix~423
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0570815af9e426b2b92568550e432df217d724b;p=php

Added more RFC2047-compliancy check in iconv_mime_decode()
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 5347ccbe96..acb1347a5f 100644
--- 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;