Apple-2-SW
/
emailler
mirror of https://github.com/bobbimanners/emailler.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

EMAIL: Improved parsing of MIME boundaries

This commit is contained in:
Bobbi Webber-Manners 2021-07-02 17:21:33 -04:00
parent 80bf13eb69
commit e943e0cca1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/email.c
View File

@ -1025,13 +1025,22 @@ static uint8_t mime_idx;
uint8_t mime_get_boundary(void) {
char *p, *q;
if (mime_idx > 2)
return 1; // No point in trying any more
p = strstr(linebuf, "boundary=\"");
return 1; // No point in trying if nested too deep
p = strstr(linebuf, "boundary=");
if (p) {
q = strstr(p + 10, "\"");
q = strstr(p + 9, "\r"); // Terminated by EOL ..
if (!q)
q = strstr(p + 9, ";"); // .. or by semicolon
if (q) {
strncpy(mime_boundaries[mime_idx], p + 10, q - p - 10);
mime_boundaries[mime_idx][q - p - 10] = '\0';
if (*(p + 9) == '\"') {
// Trim quotes, if present
strncpy(mime_boundaries[mime_idx], p + 10, q - p - 10);
mime_boundaries[mime_idx][q - p - 11] = '\0';
} else {
strncpy(mime_boundaries[mime_idx], p + 9, q - p - 9);
mime_boundaries[mime_idx][q - p - 9] = '\0';
}
//printf("Boundary: %s\n", mime_boundaries[mime_idx]);
++mime_idx;
}
return 1; // Got boundary