diff options
| author | miwi <miwi@FreeBSD.org> | 2008-10-20 00:20:34 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-10-20 00:20:34 +0800 |
| commit | 88f192eac0535b31436be11c316844bc158b54c3 (patch) | |
| tree | 6e31ff6be7f88e688e4b9ac1718f85c77a589c46 /mail | |
| parent | 7fa95e08286ed6cbfe6b074729bfcef6491cf22c (diff) | |
| download | freebsd-ports-gnome-88f192eac0535b31436be11c316844bc158b54c3.tar.gz freebsd-ports-gnome-88f192eac0535b31436be11c316844bc158b54c3.tar.zst freebsd-ports-gnome-88f192eac0535b31436be11c316844bc158b54c3.zip | |
- Fix handling of malformed multipart messages
- Bump PORTREVISION
PR: 128075
Submitted by: Udo Schweigert (maintainer)
Reported by: Guy Brand <gb@isis.u-strasbg.fr>
Obtained from: The patch has been taken from mutt's source code repository.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt-devel/files/patch-handler.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/mail/mutt-devel/files/patch-handler.c b/mail/mutt-devel/files/patch-handler.c new file mode 100644 index 000000000000..51b191aff18f --- /dev/null +++ b/mail/mutt-devel/files/patch-handler.c @@ -0,0 +1,32 @@ +--- handler.c.orig 2008-01-30 05:26:50.000000000 +0100 ++++ handler.c 2008-10-16 10:56:40.000000000 +0200 +@@ -1199,11 +1199,12 @@ + + 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; + } + +@@ -1564,6 +1565,14 @@ + + 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) + { |