Reorganize logic in ImapToken.Create(type, builder) for robustness

jstedfast · Aug 20, 2023 · b0ee23b · b0ee23b
1 parent b3a00c7
commit b0ee23b
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/MailKit/Net/Imap/ImapToken.cs b/MailKit/Net/Imap/ImapToken.cs
@@ -135,19 +135,21 @@ public static ImapToken Create (ImapTokenType type, ByteArrayBuilder builder)
 					if (builder.Equals (value, true))
 						return token;
 				}
-			} else if (builder.Equals ("NIL", true)) {
-				foreach (var token in NilTokens) {
-					value = (string) token.Value;
+			} else if (type == ImapTokenType.Atom) {
+				if (builder.Equals ("NIL", true)) {
+					foreach (var token in NilTokens) {
+						value = (string) token.Value;
 
-					if (builder.Equals (value))
-						return token;
-				}
+						if (builder.Equals (value))
+							return token;
+					}
 
-				var nil = new ImapToken (ImapTokenType.Nil, builder.ToString ());
-				NilTokens.Add (nil);
+					var nil = new ImapToken (ImapTokenType.Nil, builder.ToString ());
+					NilTokens.Add (nil);
+
+					return nil;
+				}
 
-				return nil;
-			} else {
 				if (builder.Equals ("FETCH", false))
 					return Fetch;
 				if (builder.Equals ("BODY", false))