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

+Sat Apr  2 22:19:12 BST 2005 (njh)

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

+  * libclamav/tnef.c:	Handle attachments where the data are before the title

+				(bug report and samples thanks to Stefan

+				Kaltenbrunner <stefan at kaltenbrunner.cc>

+

 Tue Mar 29 02:50:30 CEST 2005 (tk)

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

   * libclamav/filetypes.c: try to detect international text data

@@ -24,7 +24,7 @@

 #include "clamav-config.h"

 #endif

-static	char	const	rcsid[] = "$Id: tnef.c,v 1.12 2005/03/26 18:32:51 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: tnef.c,v 1.13 2005/04/02 21:16:25 nigelhorne Exp $";

 #include <stdio.h>

@@ -119,6 +119,11 @@ cli_tnef(const char *dir, int desc)

 		switch(i8) {

 			case LVL_MESSAGE:

 				/*cli_dbgmsg("TNEF - found message\n");*/

+				if(fb != NULL) {

+					fileblobDestroy(fb);

+					fb = NULL;

+				}

+				fb = fileblobCreate();

 				if(tnef_message(fp) != 0) {

 					cli_errmsg("Error reading TNEF message\n");

 					ret = CL_EFORMAT;

@@ -254,25 +259,22 @@ tnef_attachment(FILE *fp, const char *dir, fileblob **fbref)

 	switch(tag) {

 		case attATTACHTITLE:

-			if(*fbref != NULL)

-				fileblobDestroy(*fbref);

-			*fbref = fileblobCreate();

-

-			if(*fbref == NULL)

-				return -1;

 			string = cli_malloc(length + 1);

-

 			if(fread(string, 1, length, fp) != length)

 				return -1;

 			string[length] = '\0';

 			cli_dbgmsg("TNEF filename %s\n", string);

+			if(*fbref == NULL) {

+				*fbref = fileblobCreate();

+				if(*fbref == NULL)

+					return -1;

+			}

 			fileblobSetFilename(*fbref, dir, string);

 			free(string);

 			break;

 		case attATTACHDATA:

 			if(*fbref == NULL) {

 				*fbref = fileblobCreate();

-

 				if(*fbref == NULL)

 					return -1;

 			}