Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #60494: iconv_mime_decode does ignore special characters

Author: cmb69

NEWS

@@ -19,6 +19,7 @@ PHP                                                                        NEWS
 - iconv:
   . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers).
     (cmb)
+  . Fixed bug #60494 (iconv_mime_decode does ignore special characters). (cmb)
   . Fixed bug #55146 (iconv_mime_decode_headers() skips some headers). (cmb)
   . Fixed bug #53891 (iconv_mime_encode() fails to Q-encode UTF-8 string). (cmb)
 

ext/iconv/iconv.c

@@ -1534,7 +1534,10 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st
 						break;
 
 					default: /* first letter of a non-encoded word */
-						_php_iconv_appendc(pretval, *p1, cd_pl);
+						err = _php_iconv_appendc(pretval, *p1, cd_pl);
+						if (err != PHP_ICONV_ERR_SUCCESS) {
+							goto out;
+						}
 						encoded_word = NULL;
 						if ((mode & PHP_ICONV_MIME_DECODE_STRICT)) {
 							scan_stat = 12;

ext/iconv/tests/bug60494.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Bug #60494 (iconv_mime_decode does ignore special characters)
+--SKIPIF--
+<?php
+if (!extension_loaded('iconv')) die('skip iconv extension not available');
+?>
+--FILE--
+<?php
+var_dump(iconv_mime_decode('ä'));
+var_dump(iconv_mime_decode('ö'));
+var_dump(iconv_mime_decode('ß'));
+?>
+===DONE===
+--EXPECTF--
+Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d
+bool(false)
+
+Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d
+bool(false)
+
+Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d
+bool(false)
+===DONE===