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

+Tue Sep 11 10:33:21 BST 2007 (njh)

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

+  * libclamav:	Various code clean ups and optimisations

+

 Sun Sep  9 13:42:26 CEST 2007 (acab)

   * libclamav/nsis: tidy

@@ -653,9 +653,9 @@ fileblobScan(const fileblob *fb)

 #ifndef	C_WINDOWS

 	/*

 	 * FIXME: On Windows, cli_readn gives "bad file descriptor" when called

-	 * by cli_check_mydoom_log from a call do cli_magic_scandesc here which

-	 * implies that the file descriptor is getting closed somewhere, but I

-	 * can't see where.

+	 * by cli_check_mydoom_log from the call to cli_magic_scandesc here

+	 * which implies that the file descriptor is getting closed somewhere,

+	 * but I can't see where.

 	 * One possible fix would be to duplicate cli_scanfile here.

 	 */

 	fflush(fb->fp);

@@ -3255,10 +3255,13 @@ strstrip(char *s)

 	return(strip(s, (int)strlen(s) + 1));

 }

+/*

+ * Returns 0 for OK, -1 for error

+ */

 static int

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

 {

-	char *copy, *p;

+	char *copy, *p, *buf;

 	const char *ptr;

 	int commandNumber;

@@ -3278,6 +3281,8 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 	else

 		ptr = arg;

+	buf = NULL;

+

 	switch(commandNumber) {

 		case CONTENT_TYPE:

 			/*

@@ -3309,6 +3314,12 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 				int i;

 				char *mimeArgs;	/* RHS of the ; */

+				buf = cli_malloc(strlen(ptr) + 1);

+				if(buf == NULL) {

+					if(copy)

+						free(copy);

+					return -1;

+				}

 				/*

 				 * Some clients are broken and

 				 * put white space after the ;

@@ -3332,12 +3343,11 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 					if(ptr[0] != '/') {

 						char *s;

-						char *mimeType;	/* LHS of the ; */

 #ifdef CL_THREAD_SAFE

 						char *strptr = NULL;

 #endif

-						s = mimeType = cli_strtok(ptr, 0, ";");

+						s = cli_strtokbuf(ptr, 0, ";", buf);

 						/*

 						 * Handle

 						 * Content-Type: foo/bar multipart/mixed

@@ -3371,12 +3381,10 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 									len = strstrip(s);

 								}

 								if(len) {

-									if(strchr(s, ' ')) {

-										char *t = cli_strtok(s, 0, " ");

-

-										messageSetMimeSubtype(m, t);

-										free(t);

-									} else

+									if(strchr(s, ' '))

+										messageSetMimeSubtype(m,

+											cli_strtokbuf(s, 0, " ", buf));

+									else

 										messageSetMimeSubtype(m, s);

 								}

 							}

@@ -3388,8 +3396,6 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 							if(*s == '\0')

 								break;

 						}

-						if(mimeType)

-							free(mimeType);

 					}

 				}

@@ -3400,11 +3406,10 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 				 * we find the boundary argument set it

 				 */

 				i = 1;

-				while((mimeArgs = cli_strtok(ptr, i++, ";")) != NULL) {

+				while((mimeArgs = cli_strtokbuf(ptr, i++, ";", buf)) != NULL) {

 					cli_dbgmsg("mimeArgs = '%s'\n", mimeArgs);

 					messageAddArguments(m, mimeArgs);

-					free(mimeArgs);

 				}

 			}

 			break;

@@ -3412,15 +3417,18 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 			messageSetEncoding(m, ptr);

 			break;

 		case CONTENT_DISPOSITION:

-			p = cli_strtok(ptr, 0, ";");

+			buf = cli_malloc(strlen(ptr) + 1);

+			if(buf == NULL) {

+				if(copy)

+					free(copy);

+				return -1;

+			}

+			p = cli_strtokbuf(ptr, 0, ";", buf);

 			if(p) {

 				if(*p) {

 					messageSetDispositionType(m, p);

-					free(p);

-					p = cli_strtok(ptr, 1, ";");

-					messageAddArgument(m, p);

+					messageAddArgument(m, cli_strtokbuf(ptr, 1, ";", buf));

 				}

-				free(p);

 			}

 			if((p = (char *)messageFindArgument(m, "filename")) == NULL)

 				/*

@@ -3436,6 +3444,8 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 	}

 	if(copy)

 		free(copy);

+	if(buf)

+		free(buf);

 	return 0;

 }

@@ -5030,7 +5040,8 @@ do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, m

 	if(*rc != VIRUS) {

 		if(addToText) {

 			cli_dbgmsg("Adding to non mime-part\n");

-			*tptr = textAdd(*tptr, messageGetBody(aMessage));

+			if(messageGetBody(aMessage))

+				*tptr = textMove(*tptr, messageGetBody(aMessage));

 		} else {

 			fileblob *fb = messageToFileblob(aMessage, mctx->dir, 1);

@@ -1100,8 +1100,6 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 			/*

 			 * FIXME: We've probably run out of memory during the

 			 * text to blob.

-			 * TODO: if m->numberOfEncTypes == 1 we could delete

-			 * the text object as we decode it

 			 */

 			cli_warnmsg("Couldn't start binhex parser\n");

 			(*destroy)(ret);

@@ -2246,25 +2244,23 @@ decode(message *m, const char *in, unsigned char *out, unsigned char (*decoder)(

 		}

 		switch(nbytes) {

+			case 4:

+				*out++ = (b1 << 2) | ((b2 >> 4) & 0x3);

+				*out++ = (b2 << 4) | ((b3 >> 2) & 0xF);

+				*out++ = (b3 << 6) | (b4 & 0x3F);

+				continue;

 			case 3:

 				m->base64_3 = b3;

 			case 2:

 				m->base64_2 = b2;

 			case 1:

 				m->base64_1 = b1;

-				break;

-			case 4:

-				*out++ = (b1 << 2) | ((b2 >> 4) & 0x3);

-				*out++ = (b2 << 4) | ((b3 >> 2) & 0xF);

-				*out++ = (b3 << 6) | (b4 & 0x3F);

+				m->base64chars = nbytes;

 				break;

 			default:

 				assert(0);

 		}

-		if(nbytes != 4) {

-			m->base64chars = nbytes;

-			break;

-		}

+		break;	/* nbytes != 4 => EOL */

 	}

 	return out;

 }

@@ -116,6 +116,7 @@ static	char	const	rcsid[] = "$Id: text.c,v 1.25 2007/02/12 20:46:09 njh Exp $";

 #include "mbox.h"

 static	text	*textCopy(const text *t_head);

+static	text	*textAdd(text *t_head, const text *t);

 static	void	addToFileblob(const line_t *line, void *arg);

 static	void	getLength(const line_t *line, void *arg);

 static	void	addToBlob(const line_t *line, void *arg);

@@ -180,14 +181,19 @@ textCopy(const text *t_head)

 }

 /* Add a copy of a text to the end of the current object */

-text *

+static text *

 textAdd(text *t_head, const text *t)

 {

 	text *ret;

 	int count;

-	if(t_head == NULL)

+	if(t_head == NULL) {

+		if(t == NULL) {

+			cli_errmsg("textAdd fails sanity check\n");

+			return NULL;

+		}

 		return textCopy(t);

+	}

 	if(t == NULL)

 		return t_head;

@@ -234,16 +240,69 @@ textAddMessage(text *aText, message *aMessage)

 	else {

 		text *anotherText = messageToText(aMessage);

-		if(aText) {

-			aText = textAdd(aText, anotherText);

-			textDestroy(anotherText);

-			return aText;

-		}

+		if(aText)

+			return textMove(aText, anotherText);

 		return anotherText;

 	}

 }

 /*

+ * Put the contents of the given text at the end of the current object.

+ * The given text emptied; it can be used again if needed, though be warned that

+ * it will have an empty line at the start.

+ */

+text *

+textMove(text *t_head, text *t)

+{

+	text *ret;

+

+	if(t_head == NULL) {

+		if(t == NULL) {

+			cli_errmsg("textMove fails sanity check\n");

+			return NULL;

+		}

+		t_head = (text *)cli_malloc(sizeof(text));

+		if(t_head == NULL)

+			return NULL;

+		t_head->t_line = t->t_line;

+		t_head->t_next = t->t_next;

+		t->t_line = NULL;

+		t->t_next = NULL;

+		return t_head;

+	}

+

+	if(t == NULL)

+		return t_head;

+

+	ret = t_head;

+

+	while(t_head->t_next)

+		t_head = t_head->t_next;

+

+	/*

+	 * Move the first line manually so that the caller is left clean but

+	 * empty, the rest is moved by a simple pointer reassignment

+	 */

+	t_head->t_next = (text *)cli_malloc(sizeof(text));

+	if(t_head->t_next == NULL)

+		return NULL;

+	t_head = t_head->t_next;

+

+	assert(t_head != NULL);

+

+	if(t->t_line) {

+		t_head->t_line = t->t_line;

+		t->t_line = NULL;

+	} else

+		t_head->t_line = NULL;

+

+	t_head->t_next = t->t_next;

+	t->t_next = NULL;

+

+	return ret;

+}

+

+/*

  * Transfer the contents of the text into a blob

  * The caller must free the returned blob if b is NULL

  */

@@ -365,7 +424,8 @@ addToFileblob(const line_t *line, void *arg)

 	if(line) {

 		const char *l = lineGetData(line);

-		fileblobAddData(fb, (const unsigned char *)l, strlen(l));

+		if(l)

+			fileblobAddData(fb, (const unsigned char *)l, strlen(l));

 	}

 	fileblobAddData(fb, (const unsigned char *)"\n", 1);

 }

@@ -373,6 +433,11 @@ addToFileblob(const line_t *line, void *arg)

 static void *

 textIterate(text *t_text, void (*cb)(const line_t *item, void *arg), void *arg, int destroy)

 {

+	/*

+	 * Have two loops rather than one, so that we're not checking the

+	 * value of "destroy" lots and lots of times

+	 */

+#if	0

 	while(t_text) {

 		(*cb)(t_text->t_line, arg);

@@ -383,5 +448,24 @@ textIterate(text *t_text, void (*cb)(const line_t *item, void *arg), void *arg,

 		t_text = t_text->t_next;

 	}

+#else

+	if(destroy)

+		while(t_text) {

+			(*cb)(t_text->t_line, arg);

+

+			if(t_text->t_line) {

+				lineUnlink(t_text->t_line);

+				t_text->t_line = NULL;

+			}

+

+			t_text = t_text->t_next;

+		}

+	else

+		while(t_text) {

+			(*cb)(t_text->t_line, arg);

+

+			t_text = t_text->t_next;

+		}

+#endif

 	return arg;

 }

@@ -40,6 +40,7 @@

  *

  */

+/* The contents could change, ONLY access in text.c */

 typedef struct text {

 	line_t	*t_line;	/* NULL if the line is empty */

 	struct	text	*t_next;

@@ -49,7 +50,7 @@ typedef struct text {

 void	textDestroy(text *t_head);

 text	*textClean(text *t_head);

-text	*textAdd(text *t_head, const text *t);

 text	*textAddMessage(text *aText, message *aMessage);

+text	*textMove(text *t_head, text *t);

 blob	*textToBlob(text *t, blob *b, int destroy);

 fileblob	*textToFileblob(text *t, fileblob *fb, int destroy);