diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-25 17:42:10 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-25 17:47:29 +0200 |
| commit | 314b8ecf8b07a8b87efeca5454e36a6b55ca4dd1 (patch) | |
| tree | a0e818c2b3fbe323775239b700f4eb812643e48a | |
| parent | 7e176ddb57ec41751185e761ee19c42697e65543 (diff) | |
| parent | e29c946c29afdb0bf89c5329fcf3038448d50e17 (diff) | |
| download | php-git-314b8ecf8b07a8b87efeca5454e36a6b55ca4dd1.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #60494: iconv_mime_decode does ignore special characters
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 5 | ||||
| -rw-r--r-- | ext/iconv/tests/bug60494.phpt | 23 |
3 files changed, 28 insertions, 1 deletions
@@ -18,6 +18,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) - intl: diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index d60d2151d6..6e3202e6fa 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -1535,7 +1535,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; diff --git a/ext/iconv/tests/bug60494.phpt b/ext/iconv/tests/bug60494.phpt new file mode 100644 index 0000000000..5c658af56b --- /dev/null +++ b/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=== |