Mimeparser Bugfix

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

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index e6d65e9f42be5dfd13bfd392a37e554399df37cf..b4c61a59622d6f0610dd42f822fe179042ef19e3 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -406,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"), '=');
@@ -426,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"), '=');
@@ -435,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, '<', '>');
                        }
@@ -448,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';
@@ -539,7 +543,7 @@ static char *FindNextContent(char *ptr,
                
 
                srch = next_boundary = NULL;
-               for (srch = memchr(ptr, '-',  content_end - srch);
+               for (srch = memchr(ptr, '-',  content_end - ptr);
                     (srch != NULL) && (srch < content_end); 
                     srch = memchr(srch, '-',  content_end - srch)) 
                {