Mimeparser Bugfix

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

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index aa029b455581ea78e29fb56ab492fb96791a721a..b4c61a59622d6f0610dd42f822fe179042ef19e3 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -254,9 +254,20 @@ void mime_decode(char *partnum,
        }
 
        if (bytes_decoded > 0) if (CallBack != NULL) {
-               CallBack(name, filename, fixed_partnum(partnum),
-                       disposition, decoded,
-                       content_type, charset, bytes_decoded, "binary", id, userdata);
+                       char encoding_buf[SIZ];
+
+                       strcpy(encoding_buf, "binary");
+                       CallBack(name, 
+                                filename, 
+                                fixed_partnum(partnum),
+                                disposition, 
+                                decoded,
+                                content_type, 
+                                charset, 
+                                bytes_decoded, 
+                                encoding_buf, 
+                                id, 
+                                userdata);
        }
 
        free(decoded);
@@ -395,6 +406,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"), '=');
@@ -415,6 +427,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"), '=');
@@ -424,7 +437,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, '<', '>');
                        }
@@ -437,6 +451,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';
@@ -461,11 +476,15 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
 
 static int IsAsciiEncoding(interesting_mime_headers *m)
 {
+
        if ((m->b[encoding].len != 0) &&
-           (strcmp(m->b[encoding].Key, "binary") == 0))
-               return 0;
-       else 
+           (strcasecmp(m->b[encoding].Key, "base64") == 0))
                return 1;
+       if ((m->b[encoding].len != 0) &&
+           (strcmp(m->b[encoding].Key, "quoted-printable") == 0))
+               return 1;
+
+       return 0;
 }
 
 static char *FindNextContent(char *ptr,
@@ -521,8 +540,13 @@ static char *FindNextContent(char *ptr,
                        if (pptr < content_end)
                                ptr = pptr;
                }
-               next_boundary = NULL;
-               for (srch=ptr; srch<content_end; ++srch) {
+               
+
+               srch = next_boundary = NULL;
+               for (srch = memchr(ptr, '-',  content_end - ptr);
+                    (srch != NULL) && (srch < content_end); 
+                    srch = memchr(srch, '-',  content_end - srch)) 
+               {
                        if (!memcmp(srch, 
                                    m->b[startary].Key, 
                                    m->b[startary].len)) 
@@ -530,6 +554,8 @@ static char *FindNextContent(char *ptr,
                                next_boundary = srch;
                                srch = content_end;
                        }
+                       else srch ++;
+
                }
 
        }
@@ -598,9 +624,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,
@@ -608,8 +640,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;