diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 61f48684b47..5a7f968813b 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 00000000000..1a2173a09b9 --- /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-- + +--FILE-- + + 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) "€" + } +}