Added more MimeParser tests for message/rfc822 handling

Also fixed a bug with Content-Length calculations exposed by these tests.
jstedfast · Sep 4, 2021 · 11ac9e8 · 11ac9e8
1 parent 8bcfbfb
commit 11ac9e8
Show file tree

Hide file tree

Showing 3 changed files with 352 additions and 35 deletions.
diff --git a/MimeKit/AsyncMimeParser.cs b/MimeKit/AsyncMimeParser.cs
@@ -312,11 +312,11 @@ async Task ConstructMessagePartAsync (MessagePart rfc822, MimeEntityEndEventArgs
 						case BoundaryType.ParentBoundary:
 							return;
 						case BoundaryType.ParentEndBoundary:
-							// ignore "From " boundaries, broken mailers tend to include these...
-							if (!IsMboxMarker (start)) {
-								return;
+							if (options.RespectContentLength && IsMboxMarker (start)) {
+								// Allow StepHeaders() to decide.
+								break;
 							}
-							break;
+							return;
 						}
 					}
 				}

diff --git a/MimeKit/MimeParser.cs b/MimeKit/MimeParser.cs
@@ -880,7 +880,7 @@ unsafe bool StepHeaders (byte* inbuf, ref bool scanningFieldName, ref bool check
 					if (!valid) {
 						length = inptr - start;
 
-						if (format == MimeFormat.Mbox && inputIndex >= contentEnd && length >= 5 && IsMboxMarker (start)) {
+						if (format == MimeFormat.Mbox && GetOffset ((int) (start - inbuf)) >= contentEnd && length >= 5 && IsMboxMarker (start)) {
 							// we've found the start of the next message...
 							inputIndex = (int) (start - inbuf);
 							state = MimeParserState.Complete;
@@ -1434,11 +1434,11 @@ unsafe void ConstructMessagePart (MessagePart rfc822, MimeEntityEndEventArgs arg
 				case BoundaryType.ParentBoundary:
 					return;
 				case BoundaryType.ParentEndBoundary:
-					// ignore "From " boundaries, broken mailers tend to include these...
-					if (!IsMboxMarker (start)) {
-						return;
+					if (options.RespectContentLength && IsMboxMarker (start)) {
+						// Allow StepHeaders() to decide.
+						break;
 					}
-					break;
+					return;
 				}
 			}