Add more bounds checking for TryParseMailbox()

Fixes issue #421
jstedfast · Jul 26, 2018 · 4044269 · 4044269
1 parent efa8508
commit 4044269
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/MimeKit/InternetAddress.cs b/MimeKit/InternetAddress.cs
@@ -425,16 +425,16 @@ internal static bool TryParseMailbox (ParserOptions options, byte[] text, int st
 				} while (index < endIndex && text[index] == '<');
 			}
 
+			if (index < endIndex && !ParseUtils.SkipCommentsAndWhiteSpace (text, ref index, endIndex, throwOnError))
+				return false;
+
 			if (index >= endIndex) {
 				if (throwOnError)
 					throw new ParseException (string.Format ("Incomplete mailbox at offset {0}", startIndex), startIndex, index);
 
 				return false;
 			}
 
-			if (!ParseUtils.SkipCommentsAndWhiteSpace (text, ref index, endIndex, throwOnError))
-				return false;
-
 			if (text[index] == (byte) '@') {
 				// Note: we always pass 'false' as the throwOnError argument here so that we can throw a more informative exception on error
 				if (!DomainList.TryParse (text, ref index, endIndex, false, out route)) {
@@ -451,10 +451,18 @@ internal static bool TryParseMailbox (ParserOptions options, byte[] text, int st
 					return false;
 				}
 
+				// skip over ':'
 				index++;
 
 				if (!ParseUtils.SkipCommentsAndWhiteSpace (text, ref index, endIndex, throwOnError))
 					return false;
+
+				if (index >= endIndex) {
+					if (throwOnError)
+						throw new ParseException (string.Format ("Incomplete mailbox at offset {0}", startIndex), startIndex, index);
+
+					return false;
+				}
 			}
 
 			// Note: The only syntactically correct sentinel token here is the '>', but alas... to deal with the first example