Fixed the IMAP parser to properly accept qstrings (and literals) for …

…the header field names Fixes issue #115
jstedfast · Nov 21, 2014 · adc50f9 · adc50f9
1 parent 58659dc
commit adc50f9
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/MailKit/Net/Imap/ImapFolder.cs b/MailKit/Net/Imap/ImapFolder.cs
@@ -2185,8 +2185,17 @@ static void FetchSummaryItems (ImapEngine engine, ImapCommand ic, int index)
 									if (token.Type == ImapTokenType.CloseParen)
 										break;
 
-									if (token.Type != ImapTokenType.Atom)
+									// the header field names will generally be atoms or qstrings but may also be literals
+									switch (token.Type) {
+									case ImapTokenType.Literal:
+										engine.ReadLiteral (ic.CancellationToken);
+										break;
+									case ImapTokenType.QString:
+									case ImapTokenType.Atom:
+										break;
+									default:
 										throw ImapEngine.UnexpectedToken (token, false);
+									}
 								} while (true);
 							} else if (token.Type != ImapTokenType.Atom) {
 								throw ImapEngine.UnexpectedToken (token, false);
@@ -3387,8 +3396,17 @@ static void FetchMessageBody (ImapEngine engine, ImapCommand ic, int index)
 								if (token.Type == ImapTokenType.CloseParen)
 									break;
 
-								if (token.Type != ImapTokenType.Atom)
+								// the header field names will generally be atoms or qstrings but may also be literals
+								switch (token.Type) {
+								case ImapTokenType.Literal:
+									engine.ReadLiteral (ic.CancellationToken);
+									break;
+								case ImapTokenType.QString:
+								case ImapTokenType.Atom:
+									break;
+								default:
 									throw ImapEngine.UnexpectedToken (token, false);
+								}
 							} while (true);
 						} else if (token.Type != ImapTokenType.Atom) {
 							throw ImapEngine.UnexpectedToken (token, false);