Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2024-10-31 13:08:40 +00:00
Code Issues Projects Releases Wiki Activity

EMAIL: Allow boundary= on new line when parsing hdrs

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2021-06-29 19:47:49 -04:00
parent 6b1cde52c1
commit 6919adb9be
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/email.c
View File

@ -1016,11 +1016,16 @@ static uint8_t mime_idx;
/* /*
* linebuf[] is expected to contain the Content-Type: header * linebuf[] is expected to contain the Content-Type: header
* Parse it and obtain the MIME boundary, write it to buf[] * Parse it and obtain the MIME boundary, write it to buf[]
* Returns 1 if boundary was found or if there is no room for more
* boundaries to be stored, 0 if boundary was not found.
*
* Three levels of nesting are supported, to avoid mime_boundaries[]
* chewing up too much memory.
*/ */
void mime_get_boundary(void) { uint8_t mime_get_boundary(void) {
char *p, *q; char *p, *q;
if (mime_idx > 2) if (mime_idx > 2)
return; return 1; // No point in trying any more
p = strstr(linebuf, "boundary=\""); p = strstr(linebuf, "boundary=\"");
if (p) { if (p) {
q = strstr(p + 10, "\""); q = strstr(p + 10, "\"");
@ -1029,7 +1034,9 @@ void mime_get_boundary(void) {
mime_boundaries[mime_idx][q - p - 10] = '\0'; mime_boundaries[mime_idx][q - p - 10] = '\0';
++mime_idx; ++mime_idx;
} }
return 1; // Got boundary
} }
return 0; // Did not get boundary
} }
/* /*
@ -1162,7 +1169,7 @@ restart:
printf("\n<Not showing HTML>\n"); printf("\n<Not showing HTML>\n");
mime = 1; mime = 1;
} else { } else {
mime_get_boundary(); mime_get_boundary(); // #1 email body
mime_binary = 1; mime_binary = 1;
mime = 3; mime = 3;
} }
@ -1300,8 +1307,8 @@ retry:
do { do {
get_line(fp, 0, linebuf, LINEBUFSZ, &pos); get_line(fp, 0, linebuf, LINEBUFSZ, &pos);
if (!strncasecmp(linebuf, ct, 14)) { if (!strncasecmp(linebuf, ct, 14)) {
mime = 4; mime = 3 + mime_get_boundary(); // 4 if boundary, 3 otherwise
mime_get_boundary(); continue;
} }
if (!strncasecmp(linebuf, cte, 27)) { if (!strncasecmp(linebuf, cte, 27)) {
mime = 4; mime = 4;
@ -1310,6 +1317,11 @@ retry:
mime = 0; mime = 0;
break; break;
} }
continue;
}
if (mime == 3) { // We have Content-Type but no boundary yet
mime_get_boundary();
mime = 4;
} }
} while (linebuf[0] != '\r'); } while (linebuf[0] != '\r');
pos = hh.skipbytes; pos = hh.skipbytes;
@ -1768,8 +1780,8 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
if (!strncasecmp(linebuf, mime_ver, 17)) if (!strncasecmp(linebuf, mime_ver, 17))
mime = 1; mime = 1;
if (!strncasecmp(linebuf, ct, 14)) { if (!strncasecmp(linebuf, ct, 14)) {
mime = 4; mime = 3 + mime_get_boundary(); // 4 if boundary, 3 otherwise
mime_get_boundary(); continue;
} }
if (!strncasecmp(linebuf, cte, 27)) { if (!strncasecmp(linebuf, cte, 27)) {
mime = 4; mime = 4;
@ -1778,6 +1790,11 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
error(ERR_NONFATAL, unsupp_enc, linebuf + 27); error(ERR_NONFATAL, unsupp_enc, linebuf + 27);
return; return;
} }
continue;
}
if (mime == 3) { // We have Content-Type but no boundary yet
mime_get_boundary();
mime = 4;
} }
} while (linebuf[0] != '\r'); } while (linebuf[0] != '\r');
pos = h->skipbytes; pos = h->skipbytes;
@ -1807,7 +1824,7 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
} else if (!strncmp(writep + 14, "text/html", 9)) { } else if (!strncmp(writep + 14, "text/html", 9)) {
mime = 1; mime = 1;
} else { } else {
mime_get_boundary(); mime_get_boundary(); // #4 email body
mime_binary = 1; mime_binary = 1;
mime = 3; mime = 3;
} }