From owner-freebsd-ports-bugs@FreeBSD.ORG  Thu Oct 16 09:10:04 2008
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BFE2106569A
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Thu, 16 Oct 2008 09:10:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id EE2018FC17
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Thu, 16 Oct 2008 09:10:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G9A3Oc013607
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Thu, 16 Oct 2008 09:10:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id m9G9A3XM013606;
	Thu, 16 Oct 2008 09:10:03 GMT (envelope-from gnats)
Date: Thu, 16 Oct 2008 09:10:03 GMT
Message-Id: <200810160910.m9G9A3XM013606@freefall.freebsd.org>
To: freebsd-ports-bugs@FreeBSD.org
From: "Schweigert, Udo CERT" <Udo.Schweigert@siemens.com>
Cc: 
Subject: Re: ports/128075: mail/mutt problem with malformed multipart mail
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: "Schweigert, Udo CERT" <Udo.Schweigert@siemens.com>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2008 09:10:04 -0000

The following reply was made to PR ports/128075; it has been noted by GNATS.

From: "Schweigert, Udo CERT" <Udo.Schweigert@siemens.com>
To: bug-followup@FreeBSD.ORG
Cc: Udo Schweigert <Udo.Schweigert@siemens.com>
Subject: Re: ports/128075: mail/mutt problem with malformed multipart mail
Date: Thu, 16 Oct 2008 11:09:16 +0200

 Please apply the following patch.
 Committer: cvs add files/patch-handler.c 
 
 Message: Fix handling of malformed multipart messages. The patch has been
 taken from mutt's source code repository.
 
 Regards
 
 Udo
 
 diff -ru  /usr/ports/mail/mutt-devel/files/patch-handler.c ./files/patch-handler.c
 --- /usr/ports/mail/mutt-devel/files/patch-handler.c	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/patch-handler.c	2008-10-16 10:59:30.000000000 +0200
 @@ -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)
 +   {