diff options
| -rw-r--r-- | ext/imap/php_imap.c | 2 | ||||
| -rw-r--r-- | ext/imap/tests/bug53377.phpt | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 61f48684b4..5a7f968813 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4235,7 +4235,7 @@ PHP_FUNCTION(imap_mime_header_decode) } offset = end_token+2; - for (i = 0; (string[offset + i] == ' ') || (string[offset + i] == 0x0a) || (string[offset + i] == 0x0d); i++); + for (i = 0; (string[offset + i] == ' ') || (string[offset + i] == 0x0a) || (string[offset + i] == 0x0d) || (string[offset + i] == '\t'); i++); if ((string[offset + i] == '=') && (string[offset + i + 1] == '?') && (offset + i < end)) { offset += i; } diff --git a/ext/imap/tests/bug53377.phpt b/ext/imap/tests/bug53377.phpt new file mode 100644 index 0000000000..1a2173a09b --- /dev/null +++ b/ext/imap/tests/bug53377.phpt @@ -0,0 +1,38 @@ +--TEST-- +Bug #53377 (imap_mime_header_decode() doesn't ignore \t during long MIME header unfolding) +--SKIPIF-- +<?php + if (!extension_loaded("imap")) { + die("skip imap extension not available"); + } +?> +--FILE-- +<?php +$s = "=?UTF-8?Q?=E2=82=AC?="; +$header = "$s\n $s\n\t$s"; + +var_dump(imap_mime_header_decode($header)); +--EXPECT-- +array(3) { + [0]=> + object(stdClass)#1 (2) { + ["charset"]=> + string(5) "UTF-8" + ["text"]=> + string(3) "€" + } + [1]=> + object(stdClass)#2 (2) { + ["charset"]=> + string(5) "UTF-8" + ["text"]=> + string(3) "€" + } + [2]=> + object(stdClass)#3 (2) { + ["charset"]=> + string(5) "UTF-8" + ["text"]=> + string(3) "€" + } +} |