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

+Mon Jul 26 09:31:39 BST 2004 (njh)

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

+  * libclamav/message.c:	Fix occasional crash when scanning

+  	multipart within multipart e-mails

+

 Sun Jul 25 12:52:07 BST 2004 (njh)

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

   * clamav-milter:	Fixed warning message when building on FreeBSD4.9

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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.67  2004/07/26 08:31:04  nigelhorne

+ * Fix embedded multi parts

+ *

  * Revision 1.66  2004/07/20 15:17:44  nigelhorne

  * Remove overlapping strcpy

  *

@@ -195,7 +198,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.66 2004/07/20 15:17:44 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.67 2004/07/26 08:31:04 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1392,6 +1395,24 @@ messageToText(message *m)

 				if(strchr(line, '='))

 					break;

 		}

+		if(m->base64chars) {

+			unsigned char data[4];

+			unsigned char *ptr;

+

+			ptr = decode(m, NULL, data, base64, FALSE);

+			if(ptr) {

+				if(first == NULL)

+					first = last = cli_malloc(sizeof(text));

+				else {

+					last->t_next = cli_malloc(sizeof(text));

+					last = last->t_next;

+				}

+

+				if(last != NULL)

+					last->t_text = data[0] ? strdup((char *)data) : NULL;

+			}

+			m->base64chars = 0;

+		}

 	}

 	if(last)