@@ -1,3 +1,9 @@

+Thu Apr 29 09:59:41 BST 2004 (njh)

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

+  * libclamav:		Tidied the handling of content disposition type:

+  				better handling of out of memory

+				right chop white space

+

 Thu Apr 29 08:36:49 BST 2004 (njh)

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

   * clamav-milter:	Fixed typo, remove but introduced yesterday where the

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

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.68  2004/04/29 08:59:24  nigelhorne

+ * Tidied up SetDispositionType

+ *

  * Revision 1.67  2004/04/23 10:47:41  nigelhorne

  * If an inline text portion has a filename treat is as an attachment

  *

@@ -192,7 +195,7 @@

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

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.67 2004/04/23 10:47:41 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.68 2004/04/29 08:59:24 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -256,7 +259,6 @@ static	int	endOfMessage(const char *line, const char *boundary);

 static	int	initialiseTables(table_t **rfc821Table, table_t **subtypeTable);

 static	int	getTextPart(message *const messages[], size_t size);

 static	size_t	strip(char *buf, int len);

-static	size_t	strstrip(char *s);

 static	bool	continuationMarker(const char *line);

 static	int	parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const char *arg);

 static	void	saveTextPart(message *m, const char *dir);

@@ -1665,7 +1667,7 @@ strip(char *buf, int len)

  * strstrip:

  *	Strip a given string

  */

-static size_t

+size_t

 strstrip(char *s)

 {

 	if(s == (char *)NULL)

@@ -38,3 +38,5 @@ typedef enum {

 #ifdef C_BSD

 #define UNIX

 #endif

+

+size_t	strstrip(char *s);	/* remove trailing white space */

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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.53  2004/04/29 08:59:24  nigelhorne

+ * Tidied up SetDispositionType

+ *

  * Revision 1.52  2004/04/05 12:04:56  nigelhorne

  * Scan attachments with no filename

  *

@@ -153,7 +156,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.52 2004/04/05 12:04:56 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.53 2004/04/29 08:59:24 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -358,17 +361,25 @@ messageSetDispositionType(message *m, const char *disptype)

 {

 	assert(m != NULL);

+	if(m->mimeDispositionType)

+		free(m->mimeDispositionType);

+	if(disptype == NULL) {

+		m->mimeDispositionType = NULL;

+		return;

+	}

+

 	/*

 	 * It's broken for there to be an entry such as "Content-Disposition:"

 	 * However some spam and viruses are rather broken, it's a sign

 	 * that something is wrong if we get that - maybe we should force a

 	 * scan of this part

 	 */

-	if(disptype) {

-		while(isspace((int)*disptype))

-			disptype++;

-		if(*disptype)

-			m->mimeDispositionType = strdup(disptype);

+	while(*disptype && isspace((int)*disptype))

+		disptype++;

+	if(*disptype) {

+		m->mimeDispositionType = strdup(disptype);

+		if(m->mimeDispositionType)

+			strstrip(m->mimeDispositionType);

 	}

 }