X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=6aaae2f5644fdb25db1e101cb30c00e164e76faa;hp=1bafc6b3e60655c860228bbcb7cf87650ab9d879;hb=688ac22f746f785c27ac99ac86aa85a3035a3638;hpb=129050c6742f6be13fa5635ba03542b7fb2a9525

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 1bafc6b..6aaae2f 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -116,8 +116,8 @@ string_list_t *mutt_parse_references(char *s, int in_reply_to)
                 o = NULL;
             } else {
                 new = p_new(char, n + m + 1);
-                strcpy(new, o);
-                strcpy(new + n, s);
+                m_strcpy(new, n + m + 1, o);
+                m_strcpy(new + n, m + 1, s);
             }
         }
 
@@ -300,7 +300,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
          * field, so we can attempt to convert the type to BODY here.
          */
         switch (ct->type) {
-            char buffer[SHORT_STRING];
+            char buffer[STRING];
 
           case TYPETEXT:
             ct->subtype = m_strdup("plain");
@@ -438,7 +438,7 @@ void mutt_parse_part(FILE *fp, BODY *b)
         if (b->subtype) {
             fseeko(fp, b->offset, SEEK_SET);
 
-            if (mutt_is_message_type(b->type, b->subtype)) {
+            if (mutt_is_message_type(b)) {
                 b->parts = mutt_parse_messageRFC822(fp, b);
             } else
             if (mime_which_token(b->subtype, -1) == MIME_EXTERNAL_BODY) {
@@ -608,7 +608,7 @@ uncomment_timezone(char *buf, size_t buflen, const char *tz)
 time_t mutt_parse_date(const char *s, HEADER *h)
 {
     int zhours = 0, zminutes = 0, zoccident = 0;
-    char scratch[SHORT_STRING];
+    char scratch[STRING];
     struct tm tm;
     int count = 0;
     char *p;
@@ -625,7 +625,7 @@ time_t mutt_parse_date(const char *s, HEADER *h)
     p_clear(&tm, 1);
 
     while ((p = strtok (p, " \t")) != NULL) {
-        char tzstr[SHORT_STRING];
+        char tzstr[STRING];
         const char *ptz;
 
         switch (count) {