From: Eric W. Biederman <ebiederm@xmission.com>
Date: Mon, 12 Jun 2006 19:48:35 +0000 (-0600)
Subject: Don't parse any headers in the real body of an email message.
X-Git-Tag: v1.4.1-rc1~26^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2662dbfa58a2d12d1ab3d240b643b9506f43523b;p=git.git

Don't parse any headers in the real body of an email message.

It was pointed out that the current behaviour might mispart a patch comment
so remove this behaviour for now.

[jc: this fixes "From: line in the middle" check in t5100 test.]

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/mailinfo.c b/mailinfo.c
index 5b6c2157e..0ccd49008 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -246,6 +246,8 @@ static int eatspace(char *line)
 /* First lines of body can have From:, Date:, and Subject: */
 static void handle_inbody_header(int *seen, char *line)
 {
+	if (*seen & SEEN_PREFIX)
+		return;
 	if (!memcmp(">From", line, 5) && isspace(line[5])) {
 		if (!(*seen & SEEN_BOGUS_UNIX_FROM)) {
 			*seen |= SEEN_BOGUS_UNIX_FROM;