Changeset 5421:f5fe657f0633

Timestamp:

2008-06-24 23:12:02 (5 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Make multipart decoding a little more forgiving.
First, ignore bad content-transfer-encoding in multipart sections.
Second, if an attachment fails to decode, print a warning and continue
instead of giving up on the entire message.

Files:

• ChangeLog (modified) (1 diff)
• handler.c (modified) (2 diffs)

ChangeLog

@@ +1 @@
+1970-01-01 00:00 +0000  Brendan Cully  <brendan@kublai.com>  (a2e8f6fab8d3)
+
+        * smtp.c: Test that envelope from or from is set before attempting
+        SMTP delivery. Closes #3079.
+
+2008-06-14 18:23 -0700  Christoph Berg  <cb@df7cb.de>  (4b790909a037)
+
+        * doc/mbox.man: Document that From_ lines use asctime-style dates,
+        not RFC2822 dates. Closes #3077.
+
 2008-06-11 22:45 -0700  Alexey I. Froloff  <raorn@altlinux.org>  (1e8ca708a52f)
 

handler.c

@@ -1200 +1200 @@
     if (rc)
     {
+      mutt_error ("One or more parts of this message could not be displayed");
       dprint (1, (debugfile, "Failed on attachment #%d, type %s/%s.\n", count, TYPE(p), NONULL (p->subtype)));
     }
     
-    if (rc || ((s->flags & M_REPLYING)
-               && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
+    if ((s->flags & M_REPLYING)
+        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE))
       break;
   }
@@ -1565 +1566 @@
     if (!handler)
       handler = multipart_handler;
+    
+    if (b->encoding != ENC7BIT && b->encoding != ENC8BIT
+        && b->encoding != ENCBINARY)
+    {
+      dprint (1, (debugfile, "Bad encoding type %d for multipart entity, "
+                  "assuming 7 bit\n", b->encoding));
+      b->encoding = ENC7BIT;
+    }
   }
   else if (WithCrypto && b->type == TYPEAPPLICATION)