From b59e97d0a7cf97ed68a0071cd3e90ecfe0c04cc5 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 18 Apr 2019 11:28:48 +0200 Subject: #213 Add support for invalid empty () in FETCH body structure (non-strict) --- src/vmime/net/imap/IMAPParser.hpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/vmime/net/imap/IMAPParser.hpp b/src/vmime/net/imap/IMAPParser.hpp index 186ac23f..70781eae 100644 --- a/src/vmime/net/imap/IMAPParser.hpp +++ b/src/vmime/net/imap/IMAPParser.hpp @@ -3398,11 +3398,24 @@ public: if (VIMAP_PARSER_TRY_CHECK(one_char <'('> )) { - VIMAP_PARSER_GET_PUSHBACK(body_fld_param_item, m_items); + bool isNIL = false; + + if (!parser.isStrict()) { + + // In non-strict mode, allow "()" instead of "NIL" + if (VIMAP_PARSER_TRY_CHECK(one_char <')'> )) { + isNIL = true; + } + } + + if (!isNIL) { - while (!VIMAP_PARSER_TRY_CHECK(one_char <')'> )) { - VIMAP_PARSER_CHECK(SPACE); VIMAP_PARSER_GET_PUSHBACK(body_fld_param_item, m_items); + + while (!VIMAP_PARSER_TRY_CHECK(one_char <')'> )) { + VIMAP_PARSER_CHECK(SPACE); + VIMAP_PARSER_GET_PUSHBACK(body_fld_param_item, m_items); + } } } else { -- cgit v1.2.3