@@ -1,3 +1,7 @@

+Mon Apr  5 13:19:02 BST 2004 (njh)

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

+  * libclamav:	Scan attachments with no filename (suggestion by Trog)

+

 Mon Apr  5 10:47:43 BST 2004 (njh)

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

   * libclamav/mbox.c:	Added SAVE_TO_DISC #define which, when activated,

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

  *

  * Change History:

  * $Log: message.c,v $

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

+ * Scan attachments with no filename

+ *

  * Revision 1.51  2004/04/01 15:32:34  nigelhorne

  * Graceful exit if messageAddLine fails in strdup

  *

@@ -150,7 +153,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.51 2004/04/01 15:32:34 nigelhorne Exp $";

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

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -771,7 +774,7 @@ messageClean(message *m)

  * The caller must free the returned blob

  */

 blob *

-messageToBlob(const message *m)

+messageToBlob(message *m)

 {

 	blob *b;

 	const text *t_line = NULL;

@@ -996,6 +999,10 @@ messageToBlob(const message *m)

 		memcpy(filename, &data[1], byte);

 		filename[byte] = '\0';

 		blobSetFilename(b, filename);

+		ptr = cli_malloc(strlen(filename) + 6);

+		sprintf(ptr, "name=%s", filename);

+		messageAddArgument(m, ptr);

+		free(ptr);

 		/*

 		 * skip over length, filename, version, type, creator and flags

@@ -1034,9 +1041,9 @@ messageToBlob(const message *m)

 			filename = (char *)messageFindArgument(m, "name");

 			if(filename == NULL) {

-				cli_warnmsg("Attachment sent with no filename\n");

-				blobDestroy(b);

-				return NULL;

+				cli_dbgmsg("Attachment sent with no filename\n");

+				messageAddArgument(m, "name=attachment");

+				filename = strdup("attachment");

 			}

 		}

@@ -16,6 +16,9 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  *

  * $Log: message.h,v $

+ * Revision 1.10  2004/04/05 12:04:56  nigelhorne

+ * Scan attachments with no filename

+ *

  * Revision 1.9  2004/04/01 15:32:34  nigelhorne

  * Graceful exit if messageAddLine fails in strdup

  *

@@ -74,7 +77,7 @@ encoding_type	messageGetEncoding(const message *m);

 int	messageAddLine(message *m, const char *line, int takeCopy);

 const	text	*messageGetBody(const message *m);

 void	messageClean(message *m);

-blob	*messageToBlob(const message *m);

+blob	*messageToBlob(message *m);

 text	*messageToText(const message *m);

 const	text	*uuencodeBegin(const message *m);

 const	text	*binhexBegin(const message *m);