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

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

  *

  * $Log: blob.c,v $

+ * Revision 1.13  2004/06/16 08:07:39  nigelhorne

+ * Added thread safety

+ *

  * Revision 1.12  2004/05/21 11:31:48  nigelhorne

  * Fix logic error in blobClose

  *

@@ -38,7 +41,7 @@

  * Change LOG to Log

  *

  */

-static	char	const	rcsid[] = "$Id: blob.c,v 1.12 2004/05/21 11:31:48 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: blob.c,v 1.13 2004/06/16 08:07:39 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -201,11 +204,18 @@ blobGetDataSize(const blob *b)

 void

 blobClose(blob *b)

 {

-	if(b->size > b->len) {

+	/*

+	 * Nothing more is going to be added to this blob. If it'll save more

+	 * than a trivial amount (say 64 bytes) of memory, shrink the allocation

+	 */

+	if((b->size - b->len) >= 64) {

 		unsigned char *ptr = cli_realloc(b->data, b->len);

 		if(ptr == NULL)

 			return;

+

+		cli_dbgmsg("blobClose: recovered %u bytes from %u\n",

+			b->size - b->len, b->size);

 		b->size = b->len;

 		b->data = ptr;

 	}

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

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.76  2004/06/16 08:07:39  nigelhorne

+ * Added thread safety

+ *

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

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

  *

@@ -213,7 +216,7 @@

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

  *

  */

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

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.76 2004/06/16 08:07:39 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -244,6 +247,10 @@ static	char	const	rcsid[] = "$Id: mbox.c,v 1.75 2004/06/14 09:07:10 nigelhorne E

 #include <sys/param.h>

 #include <clamav.h>

+#ifdef	CL_THREAD_SAFE

+#include <pthread.h>

+#endif

+

 #include "table.h"

 #include "mbox.h"

 #include "blob.h"

@@ -333,6 +340,10 @@ static	const	struct tableinit {

 	{	"appledouble",	APPLEDOUBLE	},

 	{	NULL,		0		}

 };

+

+#ifdef	CL_THREAD_SAFE

+static	pthread_mutex_t	tables_mutex = PTHREAD_MUTEX_INITIALIZER;

+#endif

 static	table_t	*rfc821Table, *subtypeTable;

 /* Maximum filenames under various systems */

@@ -398,15 +409,26 @@ cl_mbox(const char *dir, int desc)

 		return 0;

 	}

+#ifdef	CL_THREAD_SAFE

+	pthread_mutex_lock(&tables_mutex);

+#endif

 	if(rfc821Table == NULL) {

 		assert(subtypeTable == NULL);

 		if(initialiseTables(&rfc821Table, &subtypeTable) < 0) {

+			rfc821Table = NULL;

+			subtypeTable = NULL;

+#ifdef	CL_THREAD_SAFE

+			pthread_mutex_unlock(&tables_mutex);

+#endif

 			messageDestroy(m);

 			fclose(fd);

 			return -1;

 		}

 	}

+#ifdef	CL_THREAD_SAFE

+	pthread_mutex_unlock(&tables_mutex);

+#endif

 	/*

 	 * is it a UNIX style mbox with more than one

@@ -1369,7 +1391,7 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 				break;

 			} else if(strcasecmp(mimeSubtype, "partial") == 0)

 				/* TODO */

-				cli_warnmsg("Content-type message/partial not yet supported");

+				cli_warnmsg("Content-type message/partial not yet supported\n");

 			else if(strcasecmp(mimeSubtype, "external-body") == 0)

 				/*

 				 * I don't believe that we should be going

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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.60  2004/06/16 08:07:39  nigelhorne

+ * Added thread safety

+ *

  * Revision 1.59  2004/06/02 10:11:09  nigelhorne

  * Corrupted binHex could crash on non Linux systems

  *

@@ -174,7 +177,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.59 2004/06/02 10:11:09 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.60 2004/06/16 08:07:39 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -200,6 +203,10 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.59 2004/06/02 10:11:09 nigelhorn

 #include <ctype.h>

 #include <stdio.h>

+#ifdef	CL_THREAD_SAFE

+#include <pthread.h>

+#endif

+

 #include "mbox.h"

 #include "table.h"

 #include "blob.h"

@@ -310,6 +317,9 @@ messageReset(message *m)

 void

 messageSetMimeType(message *mess, const char *type)

 {

+#ifdef	CL_THREAD_SAFE

+	static pthread_mutex_t mime_mutex = PTHREAD_MUTEX_INITIALIZER;

+#endif

 	static table_t *mime_table;

 	int typeval;

@@ -325,19 +335,33 @@ messageSetMimeType(message *mess, const char *type)

 		if(*type++ == '\0')

 			return;

+#ifdef	CL_THREAD_SAFE

+	pthread_mutex_lock(&mime_mutex);

+#endif

 	if(mime_table == NULL) {

 		const struct mime_map *m;

 		mime_table = tableCreate();

-		if(mime_table == NULL)

+		if(mime_table == NULL) {

+#ifdef	CL_THREAD_SAFE

+			pthread_mutex_unlock(&mime_mutex);

+#endif

 			return;

+		}

 		for(m = mime_map; m->string; m++)

 			if(!tableInsert(mime_table, m->string, m->type)) {

 				tableDestroy(mime_table);

+				mime_table = NULL;

+#ifdef	CL_THREAD_SAFE

+				pthread_mutex_unlock(&mime_mutex);

+#endif

 				return;

 			}

 	}

+#ifdef	CL_THREAD_SAFE

+	pthread_mutex_unlock(&mime_mutex);

+#endif

 	typeval = tableFind(mime_table, type);

@@ -783,23 +807,13 @@ messageAddLine(message *m, const char *line, int takeCopy)

 	/*

 	 * See if this line marks the start of a non MIME inclusion that

 	 * will need to be scanned

-	 *

-	 * Notes that X- lines are not taken as start of mails because

-	 * cli_filetype() is too keen: any line it finds that starts X-

-	 * is seen to be the start of a new message, which results in too

-	 * many false positives for locating the possible start of a bounce,

-	 * and allows some instances of Worm.SomeFool.Gen-1 to get through in

-	 * bounce messages which end up not being correctly handled because

-	 * the real start of a bounce header is missed because of the earlier

-	 * false positive

 	 */

-	if(line) {

+	if(line && *line) {

 		if((m->encoding == NULL) &&

 		   (strncasecmp(line, encoding, sizeof(encoding) - 1) == 0) &&

 		   (strstr(line, "7bit") == NULL))

 			m->encoding = m->body_last;

 		else if((m->bounce == NULL) &&

-			(strncmp(line, "X-", 2) != 0) &&	/*!!*/

 			(cli_filetype(line, strlen(line)) == CL_MAILFILE))

 				m->bounce = m->body_last;

 		else if((m->binhex == NULL) &&