kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/mailinfo' 

* jc/mailinfo:
  mailinfo: skip bogus UNIX From line inside body
maint
Junio C Hamano 2006-05-28 13:39:05 -07:00
parent 51937e533a 81c5cf7865
commit d177e58425
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mailinfo.c
View File

@ -240,11 +240,18 @@ static int eatspace(char *line)
#define SEEN_FROM 01 #define SEEN_FROM 01
#define SEEN_DATE 02 #define SEEN_DATE 02
#define SEEN_SUBJECT 04 #define SEEN_SUBJECT 04
#define SEEN_PREFIX 0x08 #define SEEN_BOGUS_UNIX_FROM 010
#define SEEN_PREFIX 020


/* First lines of body can have From:, Date:, and Subject: */ /* First lines of body can have From:, Date:, and Subject: */
static void handle_inbody_header(int *seen, char *line) static void handle_inbody_header(int *seen, char *line)
{ {
if (!memcmp(">From", line, 5) && isspace(line[5])) {
if (!(*seen & SEEN_BOGUS_UNIX_FROM)) {
*seen |= SEEN_BOGUS_UNIX_FROM;
return;
}
}
if (!memcmp("From:", line, 5) && isspace(line[5])) { if (!memcmp("From:", line, 5) && isspace(line[5])) {
if (!(*seen & SEEN_FROM) && handle_from(line+6)) { if (!(*seen & SEEN_FROM) && handle_from(line+6)) {
*seen |= SEEN_FROM; *seen |= SEEN_FROM;