Mimeparser rewrite; fix bug detecting trailing MIME-Boundary

[citadel.git] / libcitadel / lib / mime_parser.c

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 7e4cbfb222ba3df3f447dfcd6474d6e7295caee8..f2aec777ab1b41774aed4cc5ed946fed9197ab79 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -210,6 +210,8 @@ void mime_decode(char *partnum,
                strcpy(encoding, "");
        if (!strcasecmp(encoding, "binary"))
                strcpy(encoding, "");
+       if (!strcasecmp(encoding, "ISO-8859-1"))
+               strcpy(encoding, "");
 
        /* If this part is not encoded, send as-is */
        if ( (strlen(encoding) == 0) || (dont_decode)) {
@@ -406,6 +408,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                if (!isspace(buf[0]) && (headerlen > 0)) {
                        if (!strncasecmp(header, "Content-type:", 13)) {
                                memcpy (m->b[content_type].Key, &header[13], headerlen - 12);
+                               m->b[content_type].Key[headerlen - 12] = '\0';
                                m->b[content_type].len = striplt (m->b[content_type].Key);
 
                                m->b[content_type_name].len = extract_key(m->b[content_type_name].Key, CKEY(m->b[content_type]), HKEY("name"), '=');
@@ -426,6 +429,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                        }
                        else if (!strncasecmp(header, "Content-Disposition:", 20)) {
                                memcpy (m->b[disposition].Key, &header[20], headerlen - 19);
+                               m->b[disposition].Key[headerlen - 19] = '\0';
                                m->b[disposition].len = striplt(m->b[disposition].Key);
 
                                m->b[content_disposition_name].len = extract_key(m->b[content_disposition_name].Key, CKEY(m->b[disposition]), HKEY("name"), '=');
@@ -435,7 +439,8 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                                m->b[disposition].len = striplt(m->b[disposition].Key);
                        }
                        else if (!strncasecmp(header, "Content-ID:", 11)) {
-                               memcpy(m->b[id].Key, &header[11], headerlen);
+                               memcpy(m->b[id].Key, &header[11], headerlen - 11);
+                               m->b[id].Key[headerlen - 11] = '\0';
                                striplt(m->b[id].Key);
                                m->b[id].len = stripallbut(m->b[id].Key, '<', '>');
                        }
@@ -448,6 +453,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                        }
                        else if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
                                memcpy(m->b[encoding].Key, &header[26], headerlen - 26);
+                               m->b[encoding].Key[headerlen - 26] = '\0';
                                m->b[encoding].len = striplt(m->b[encoding].Key);
                        }
                        *header = '\0';
@@ -538,8 +544,8 @@ static char *FindNextContent(char *ptr,
                }
                
 
-               next_boundary = NULL;
-               for (srch=ptr; 
+               srch = next_boundary = NULL;
+               for (srch = memchr(ptr, '-',  content_end - ptr);
                     (srch != NULL) && (srch < content_end); 
                     srch = memchr(srch, '-',  content_end - srch)) 
                {
@@ -620,9 +626,15 @@ static void recurseable_mime_parser(char *partnum,
                        ptr ++;
                part_start = NULL;
                do {
+                       char *optr;
 
+                       optr = ptr;
                        if (parse_MimeHeaders(SubMimeHeaders, &ptr, content_end) != 0)
                                break;
+                       if ((ptr - optr > 2) && 
+                           (*(ptr - 2) == '\r'))
+                               crlf_in_use = 1;
+                       
                        part_start = ptr;
                        
                        next_boundary = FindNextContent(ptr,
@@ -630,8 +642,11 @@ static void recurseable_mime_parser(char *partnum,
                                                        SubMimeHeaders,
                                                        m);
                        if ((next_boundary != NULL) && 
-                           (next_boundary - part_start < 3))
+                           (next_boundary - part_start < 3)) {
+                               FlushInterestingMimes(SubMimeHeaders);
+
                                continue;
+                       }
 
                        if ( (part_start != NULL) && (next_boundary != NULL) ) {
                                part_end = next_boundary;
@@ -665,8 +680,8 @@ static void recurseable_mime_parser(char *partnum,
                        if (next_boundary != NULL) {
                                /* If we pass out of scope, don't attempt to
                                 * read past the end boundary. */
-                               if ((*(next_boundary + m->b[startary].len + 1) == '-') && 
-                                   (*(next_boundary + m->b[startary].len + 2) == '-') ){
+                               if ((*(next_boundary + m->b[startary].len) == '-') && 
+                                   (*(next_boundary + m->b[startary].len + 1) == '-') ){
                                        ptr = content_end;
                                }
                                else {