@@ -1,3 +1,8 @@

+Mon Jun 14 10:07:24 BST 2004 (njh)

+----------------------------------

+  * libclamav/mbox.c:	Some spam generates very broken headers, added fix

+  	to try to scan (with warnings about the assumptions made)

+

 Sun Jun 13 14:26:33 CEST 2004 (tk)

 ----------------------------------

   * clamscan: --unace is no longer supported (when invoked on a splitted

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.75  2004/06/14 09:07:10  nigelhorne

+ * Handle spam using broken e-mail generators for multipart/alternative

+ *

  * Revision 1.74  2004/06/09 18:18:59  nigelhorne

  * Find uuencoded viruses in multipart/mixed that have no start of message boundaries

  *

@@ -210,7 +213,7 @@

  * Compilable under SCO; removed duplicate code with message.c

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.74 2004/06/09 18:18:59 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.75 2004/06/14 09:07:10 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -680,9 +683,6 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 				aText = textCopy(messageGetBody(mainMessage));

 			break;

 		case MULTIPART:

-

-			assert(mimeSubtype[0] != '\0');

-

 			boundary = messageFindArgument(mainMessage, "boundary");

 			if(boundary == NULL) {

@@ -696,6 +696,12 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 				break;

 			}

+			if(mimeSubtype[0] == '\0') {

+				cli_warnmsg("Multipart has no subtype assuming alternative\n");

+				mimeSubtype = "alternative";

+				messageSetMimeSubtype(mainMessage, "alternative");

+			}

+

 			/*

 			 * Get to the start of the first message

 			 */