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

+Sun Jan  7 21:31:06 GMT 2007 (njh)

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

+  * libclamav:		Use HAVE_STDBOOL_H

+

 Sun Jan  7 21:58:33 CET 2007 (tk)

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

   * libclamav/ole2_extract: fix endian issue in ole2_get_next_xbat_block(),

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.369 2006/12/30 17:10:08 njh Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.370 2007/01/07 21:30:49 njh Exp $";

 #ifdef	_MSC_VER

 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */

@@ -100,7 +100,7 @@ static	void	print_trace(int use_syslog);

 #define strtok_r(a,b,c)	strtok(a,b)

 #endif

-#ifdef	C_LINUX	/* Others??? Old linux, e.g. Red Hat 5.2, doesn't have this */

+#ifdef	HAVE_STDBOOL_H

 #include <stdbool.h>

 #else

 #ifdef	FALSE

@@ -299,6 +299,7 @@ static	int	exportBounceMessage(text *start, const mbox_ctx *ctx);

 static	message	*do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, mbox_ctx *mctx, message *messageIn, text **tptr, unsigned int recursion_level);

 static	int	count_quotes(const char *buf);

 static	bool	next_is_folded_header(const text *t);

+static	bool	newline_in_header(const char *line);

 static	void	checkURLs(message *m, mbox_ctx *mctx, mbox_status *rc, int is_html);

@@ -1654,7 +1655,7 @@ parseEmailFile(FILE *fin, const table_t *rfc821, const char *firstLine, const ch

 								anyHeadersFound = usefulHeader(commandNumber, cmd);

 							continue;

 					}

-					fullline = strdup(line);

+					fullline = cli_strdup(line);

 					fulllinelength = strlen(line) + 1;

 				} else if(line != NULL) {

 					fulllinelength += strlen(line);

@@ -1735,12 +1736,10 @@ parseEmailFile(FILE *fin, const table_t *rfc821, const char *firstLine, const ch

 					 * line of the body is in fact

 					 * the last lines of the header

 					 */

-					if(strncmp(line, "Message-Id: ", 12) == 0)

-						continue;

-					if(strncmp(line, "Date: ", 6) == 0)

+					if(newline_in_header(line))

 						continue;

+					bodyIsEmpty = FALSE;

 				}

-				bodyIsEmpty = FALSE;

 				lastBodyLineWasBlank = FALSE;

 			}

@@ -1810,17 +1809,17 @@ parseEmailHeaders(message *m, const table_t *rfc821)

 	ret = messageCreate();

 	for(t = messageGetBody(m); t; t = t->t_next) {

-		const char *buffer;

+		const char *line;

 		if(t->t_line)

-			buffer = lineGetData(t->t_line);

+			line = lineGetData(t->t_line);

 		else

-			buffer = NULL;

+			line = NULL;

 		if(inHeader) {

 			cli_dbgmsg("parseEmailHeaders: check '%s'\n",

-				buffer ? buffer : "");

-			if(buffer == NULL) {

+				line ? line : "");

+			if(line == NULL) {

 				/*

 				 * A blank line signifies the end of

 				 * the header and the start of the text

@@ -1841,15 +1840,15 @@ parseEmailHeaders(message *m, const table_t *rfc821)

 					/*

 					 * Continuation of line we're ignoring?

 					 */

-					if(isblank(buffer[0]))

+					if(isblank(line[0]))

 						continue;

 					/*

 					 * Is this a header we're interested in?

 					 */

-					if((strchr(buffer, ':') == NULL) ||

-					   (cli_strtokbuf(buffer, 0, ":", cmd) == NULL)) {

-						if(strncmp(buffer, "From ", 5) == 0)

+					if((strchr(line, ':') == NULL) ||

+					   (cli_strtokbuf(line, 0, ":", cmd) == NULL)) {

+						if(strncmp(line, "From ", 5) == 0)

 							anyHeadersFound = TRUE;

 						continue;

 					}

@@ -1870,15 +1869,15 @@ parseEmailHeaders(message *m, const table_t *rfc821)

 								anyHeadersFound = usefulHeader(commandNumber, cmd);

 							continue;

 					}

-					fullline = strdup(buffer);

-					fulllinelength = strlen(buffer) + 1;

-				} else if(buffer) {

-					fulllinelength += strlen(buffer);

+					fullline = cli_strdup(line);

+					fulllinelength = strlen(line) + 1;

+				} else if(line) {

+					fulllinelength += strlen(line);

 					ptr = cli_realloc(fullline, fulllinelength);

 					if(ptr == NULL)

 						continue;

 					fullline = ptr;

-					strcat(fullline, buffer);

+					strcat(fullline, line);

 				}

 				assert(fullline != NULL);

@@ -1904,25 +1903,22 @@ parseEmailHeaders(message *m, const table_t *rfc821)

 			}

 		} else {

 			if(bodyIsEmpty) {

-				if(buffer == NULL)

+				if(line == NULL)

 					/* throw away leading blank lines */

 					continue;

-				cli_dbgmsg("bodyIsEmpty, check \"%s\"\n", buffer);

 				/*

 				 * Broken message: new line in the

 				 * middle of the headers, so the first

 				 * line of the body is in fact

 				 * the last lines of the header

 				 */

-				if(strncmp(buffer, "Message-Id: ", 12) == 0)

-					continue;

-				if(strncmp(buffer, "Date: ", 6) == 0)

+				if(newline_in_header(line))

 					continue;

 				bodyIsEmpty = FALSE;

 			}

 			/*if(t->t_line && isuuencodebegin(t->t_line))

 				puts("FIXME: add fast visa here");*/

-			/*cli_dbgmsg("Add line to body '%s'\n", buffer);*/

+			/*cli_dbgmsg("Add line to body '%s'\n", line);*/

 			if(messageAddLine(ret, t->t_line) < 0)

 				break;

 		}

@@ -1986,7 +1982,7 @@ parseEmailHeader(message *m, const char *line, const table_t *rfc821)

 	copy = rfc2047(line);

 	if(copy == NULL)

 		/* an RFC checker would return -1 here */

-		copy = strdup(line);

+		copy = cli_strdup(line);

 	tokenseparater[0] = *separater;

 	tokenseparater[1] = '\0';

@@ -2415,7 +2411,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 						fullline = rfc822comments(line, NULL);

 						if(fullline == NULL)

-							fullline = strdup(line);

+							fullline = cli_strdup(line);

 						/*quotes = count_quotes(fullline);*/

@@ -3566,7 +3562,7 @@ rfc2047(const char *in)

 	size_t len;

 	if((strstr(in, "=?") == NULL) || (strstr(in, "?=") == NULL))

-		return strdup(in);

+		return cli_strdup(in);

 	cli_dbgmsg("rfc2047 '%s'\n", in);

 	out = cli_malloc(strlen(in) + 1);

@@ -3610,7 +3606,7 @@ rfc2047(const char *in)

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

 			break;

-		enctext = strdup(in);

+		enctext = cli_strdup(in);

 		if(enctext == NULL) {

 			free(out);

 			out = NULL;

@@ -4010,11 +4006,11 @@ do_checkURLs(message *m, const char *dir, tag_arguments_t *hrefs)

 #ifdef	CL_THREAD_SAFE

 			args[n].dir = dir;

-			args[n].url = strdup(url);

-			args[n].filename = strdup(name);

+			args[n].url = cli_strdup(url);

+			args[n].filename = cli_strdup(name);

 			pthread_create(&tid[n], NULL, getURL, &args[n]);

 #else

-			arg.url = strdup(url);

+			arg.url = cli_strdup(url);

 			arg.dir = dir;

 			arg.filename = name;

 			getURL(&arg);

@@ -4156,7 +4152,7 @@ checkURLs(message *m, mbox_ctx *mctx, mbox_status *rc, int is_html)

 			}

 			args[n].dir = mctx->dir;

 			args[n].url = url;

-			args[n].filename = strdup(name);

+			args[n].filename = cli_strdup(name);

 			pthread_create(&tid[n], NULL, getURL, &args[n]);

 #else

 			/* easy isn't the word I'd use... */

@@ -4543,7 +4539,7 @@ getURL(struct arg *arg)

 						while(*end && (*end != '\n'))

 							end++;

 						*end = '\0';

-						arg->url = strdup(location);

+						arg->url = cli_strdup(location);

 						cli_dbgmsg("Redirecting to %s\n", arg->url);

 						return getURL(arg);

 					}

@@ -5467,3 +5463,21 @@ next_is_folded_header(const text *t)

 		}

 	return FALSE;

 }

+

+/*

+ * This routine is called on the first line of the body of

+ * an email to handle broken messages that have newlines

+ * in the middle of its headers

+ */

+static bool

+newline_in_header(const char *line)

+{

+	cli_dbgmsg("newline_in_header, check \"%s\"\n", line);

+

+	if(strncmp(line, "Message-Id: ", 12) == 0)

+		return TRUE;

+	if(strncmp(line, "Date: ", 6) == 0)

+		return TRUE;

+

+	return FALSE;

+}

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.192 2006/12/07 09:17:30 njh Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.193 2007/01/07 21:30:49 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -60,7 +60,7 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.192 2006/12/07 09:17:30 njh Exp

 #define	RFC2045LENGTH	76	/* maximum number of characters on a line */

-#ifdef	C_LINUX	/* Others??? Old linux, e.g. Red Hat 5.2, doesn't have this */

+#ifdef	HAVE_STDBOOL_H

 #include <stdbool.h>

 #else

 #ifdef	FALSE

@@ -335,7 +335,7 @@ messageSetMimeSubtype(message *m, const char *subtype)

 	if(m->mimeSubtype)

 		free(m->mimeSubtype);

-	m->mimeSubtype = strdup(subtype);

+	m->mimeSubtype = cli_strdup(subtype);

 }

 const char *

@@ -365,7 +365,7 @@ messageSetDispositionType(message *m, const char *disptype)

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

 		disptype++;

 	if(*disptype) {

-		m->mimeDispositionType = strdup(disptype);

+		m->mimeDispositionType = cli_strdup(disptype);

 		if(m->mimeDispositionType)

 			strstrip(m->mimeDispositionType);

 	} else

@@ -516,7 +516,7 @@ messageAddArguments(message *m, const char *s)

 			 * The field is in quotes, so look for the

 			 * closing quotes

 			 */

-			key = strdup(key);

+			key = cli_strdup(key);

 			if(key == NULL)

 				return;

@@ -539,7 +539,7 @@ messageAddArguments(message *m, const char *s)

 				continue;

 			}

-			data = strdup(cptr);

+			data = cli_strdup(cptr);

 			ptr = (data) ? strchr(data, '"') : NULL;

 			if(ptr == NULL) {

@@ -645,7 +645,7 @@ messageFindArgument(const message *m, const char *variable)

 			}

 			if((*++ptr == '"') && (strchr(&ptr[1], '"') != NULL)) {

 				/* Remove any quote characters */

-				char *ret = strdup(++ptr);

+				char *ret = cli_strdup(++ptr);

 				char *p;

 				if(ret == NULL)

@@ -667,7 +667,7 @@ messageFindArgument(const message *m, const char *variable)

 				}

 				return ret;

 			}

-			return strdup(ptr);

+			return cli_strdup(ptr);

 		}

 	}

 	return NULL;

@@ -677,8 +677,9 @@ void

 messageSetEncoding(message *m, const char *enctype)

 {

 	const struct encoding_map *e;

-	int i = 0;

+	int i;

 	char *type;

+

 	assert(m != NULL);

 	assert(enctype != NULL);

@@ -1391,7 +1392,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 			filename = (char *)lineGetData(t_line->t_line);

 			if((filename = strstr(filename, " name=")) != NULL) {

-				filename = strdup(&filename[6]);

+				filename = cli_strdup(&filename[6]);

 				if(filename) {

 					cli_chomp(filename);

 					strstrip(filename);

@@ -1525,7 +1526,6 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 				lineUnlink(t_line->t_line);

 				t_line->t_line = NULL;

 			}

-

 		} while((t_line = t_line->t_next) != NULL);

 		cli_dbgmsg("Exported %u bytes using enctype %d\n", size, enctype);

@@ -1981,7 +1981,7 @@ decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, s

 				strcpy(base64buf, line);

 				copy = base64buf;

 			} else {

-				copy = strdup(line);

+				copy = cli_strdup(line);

 				if(copy == NULL)

 					break;

 			}

@@ -2407,7 +2407,7 @@ rfc2231(const char *in)

 	if(strstr(in, "*0*=") != NULL) {

 		cli_warnmsg("RFC2231 parameter continuations are not yet handled\n");

-		return strdup(in);

+		return cli_strdup(in);

 	}

 	ptr = strstr(in, "*0=");

@@ -2423,7 +2423,7 @@ rfc2231(const char *in)

 	}

 	if(ptr == NULL)	/* quick return */

-		return strdup(in);

+		return cli_strdup(in);

 	cli_dbgmsg("rfc2231 '%s'\n", in);

@@ -2493,7 +2493,7 @@ rfc2231(const char *in)

 	if(field != CONTENTS) {

 		free(ret);

 		cli_warnmsg("Invalid RFC2231 header: '%s'\n", in);

-		return strdup("");

+		return cli_strdup("");

 	}

 	*out = '\0';

@@ -2534,16 +2534,16 @@ simil(const char *str1, const char *str2)

 	unsigned int score = 0;

 	size_t common, total;

 	size_t len1, len2;

-	char ls1[MAX_PATTERN_SIZ], ls2[MAX_PATTERN_SIZ];

 	char *rs1 = NULL, *rs2 = NULL;

 	char *s1, *s2;

+	char ls1[MAX_PATTERN_SIZ], ls2[MAX_PATTERN_SIZ];

 	if(strcasecmp(str1, str2) == 0)

 		return 100;

-	if((s1 = strdup(str1)) == NULL)

+	if((s1 = cli_strdup(str1)) == NULL)

 		return OUT_OF_MEMORY;

-	if((s2 = strdup(str2)) == NULL) {

+	if((s2 = cli_strdup(str2)) == NULL) {

 		free(s1);

 		return OUT_OF_MEMORY;

 	}

@@ -2596,7 +2596,7 @@ simil(const char *str1, const char *str2)

 static unsigned int

 compare(char *ls1, char **rs1, char *ls2, char **rs2)

 {

-	unsigned int common, diff, maxchars = 0;

+	unsigned int common, maxchars = 0;

 	bool some_similarity = FALSE;

 	char *s1, *s2;

 	char *maxs1 = NULL, *maxs2 = NULL, *maxe1 = NULL, *maxe2 = NULL;

@@ -2628,7 +2628,7 @@ compare(char *ls1, char **rs1, char *ls2, char **rs2)

 					while(tolower(*s1) == tolower(*s2));

 					if(common > maxchars) {

-						diff = common - maxchars;

+						unsigned int diff = common - maxchars;

 						maxchars = common;

 						maxs1 = cs1;

 						maxs2 = cs2;

@@ -2661,7 +2661,7 @@ push(LINK1 *top, const char *string)

 	if((element = (LINK1)cli_malloc(sizeof(ELEMENT1))) == NULL)

 		return OUT_OF_MEMORY;

-	if((element->d1 = strdup(string)) == NULL)

+	if((element->d1 = cli_strdup(string)) == NULL)

 		return OUT_OF_MEMORY;

 	element->next = *top;

 	*top = element;