@@ -1,3 +1,8 @@

+Mon Nov 24 17:18:03 CET 2003 (tk)

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

+  * libclamav: cvd.c: small cleanups

+  * included mbox testing tool (test/mbox/debugm.c) from Nigel

+

 Mon Nov 24 10:19:48 IST 2003 (njh)

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

   * clamav-milter: Support AllowSupplementaryGroups

@@ -152,23 +152,63 @@ struct cl_cvd *cl_cvdparse(const char *head)

     }

     cvd = (struct cl_cvd *) cli_calloc(1, sizeof(struct cl_cvd));

-    cvd->time = cli_tok(head, 2, ':');

-    pt = cli_tok(head, 3, ':');

+    if(!(cvd->time = cli_tok(head, 2, ':'))) {

+	cli_errmsg("CVD -> Can't extract time from header.\n");

+	free(cvd);

+	return NULL;

+    }

+

+    if(!(pt = cli_tok(head, 3, ':'))) {

+	cli_errmsg("CVD -> Can't extract version from header.\n");

+	free(cvd->time);

+	free(cvd);

+	return NULL;

+    }

     cvd->version = atoi(pt);

     free(pt);

-    pt = cli_tok(head, 4, ':');

+    if(!(pt = cli_tok(head, 4, ':'))) {

+	cli_errmsg("CVD -> Can't extract signature number from header.\n");

+	free(cvd->time);

+	free(cvd);

+	return NULL;

+    }

     cvd->sigs = atoi(pt);

     free(pt);

-    pt = cli_tok(head, 5, ':');

+    if(!(pt = cli_tok(head, 5, ':'))) {

+	cli_errmsg("CVD -> Can't extract functionality level from header.\n");

+	free(cvd->time);

+	free(cvd);

+	return NULL;

+    }

     cvd->fl = (short int) atoi(pt);

     free(pt);

-    cvd->md5 = cli_tok(head, 6, ':');

-    cvd->dsig = cli_tok(head, 7, ':');

-    cvd->builder = cli_tok(head, 8, ':');

+    if(!(cvd->md5 = cli_tok(head, 6, ':'))) {

+	cli_errmsg("CVD -> Can't extract MD5 checksum from header.\n");

+	free(cvd->time);

+	free(cvd);

+	return NULL;

+    }

+

+    if(!(cvd->dsig = cli_tok(head, 7, ':'))) {

+	cli_errmsg("CVD -> Can't extract digital signature from header.\n");

+	free(cvd->time);

+	free(cvd->md5);

+	free(cvd);

+	return NULL;

+    }

+

+    if(!(cvd->builder = cli_tok(head, 8, ':'))) {

+	cli_errmsg("CVD -> Can't extract builder name from header.\n");

+	free(cvd->time);

+	free(cvd->md5);

+	free(cvd->dsig);

+	free(cvd);

+	return NULL;

+    }

     return cvd;

 }

@@ -149,7 +149,11 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	    if(parts) /* there's always one part more */

 		parts++;

 	    for(i = 1; i <= parts; i++) {

-		pt2 = cli_tok(pt, i, '*');

+		if((pt2 = cli_tok(pt, i, '*')) == NULL) {

+		    cli_errmsg("Can't extract part %d of partial signature in line %d\n", i, line);

+		    return CL_EMALFDB;

+		}

+

 		if((ret = cli_parse_add(*root, start, pt2, sigid, parts, i))) {

 		    cli_dbgmsg("parse_add() return code: %d\n", ret);

 		    cli_errmsg("readdb(): Malformed pattern line %d (file %s).\n", line, filename);

@@ -118,11 +118,14 @@ int cli_strbcasestr(const char *haystack, const char *needle)

 void cli_chomp(char *string)

 {

-    if(string[strlen(string) - 1] == 10 || string[strlen(string) - 1 ] == 13)

-	string[strlen(string) -1] = 0;

+	int l = strlen(string);

-    if(string[strlen(string) - 1] == '\r')

-	string[strlen(string) -1] = 0;

+    if(string[l - 1] == 10 || string[l - 1] == 13)

+	string[l - 1] = 0;

+

+    l = strlen(string);

+    if(string[l - 1] == '\r')

+	string[l - 1] = 0;

 }

 char *cli_tok(const char *line, int field, char delimiter)

@@ -131,7 +134,9 @@ char *cli_tok(const char *line, int field, char delimiter)

         char *buffer;

-    length = strlen(line);

+    if(!(length = strlen(line)))

+	return NULL;

+

     buffer = (char *) cli_calloc(length, sizeof(char));

     for(i = 0; i < length; i++) {

@@ -150,5 +155,10 @@ char *cli_tok(const char *line, int field, char delimiter)

     cli_chomp(buffer); /* preventive */

-    return (char *) cli_realloc(buffer, strlen(buffer) + 1);

+    if((length = strlen(buffer)))

+	return (char *) cli_realloc(buffer, strlen(buffer) + 1);

+    else {

+	free(buffer);

+	return NULL;

+    }

 }

@@ -669,7 +669,7 @@ void cvdinfo(struct optstruct *opt)

     pt = getargc(opt, 'i');

     if((cvd = cl_cvdhead(pt)) == NULL) {

-	mprintf("!Can't read CVD header from %s\n", pt);

+	mprintf("!Can't read/parse CVD header from %s\n", pt);

 	exit(1);

     }

new file mode 100644

@@ -0,0 +1,55 @@

+/*

+ * $CC $CFLAGS debugm.c -lclamav -lefence (or what ever memory debugger)

+ *

+ * njh@bandsman.co.uk

+ */

+#include <stdio.h>

+#include <errno.h>

+#include <sys/stat.h>

+#include <sys/types.h>

+#include <fcntl.h>

+#include <malloc.h>

+#include <clamav.h>

+#include <signal.h>

+#include <sys/resource.h>

+

+static void

+cleanup()

+{

+	exit(SIGINT);

+}

+

+int

+main(int argc, char **argv)

+{

+	struct rlimit rlim;

+

+	if(argc == 1) {

+		fprintf(stderr, "Usage: %s files...\n", argv[0]);

+		return 1;

+	}

+	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;

+	if(setrlimit(RLIMIT_CORE, &rlim) < 0)

+		perror("setrlimit");

+

+	if(mkdir("/tmp/mboxtest", 0750) < 0) {

+		perror("/tmp/mboxtest");

+		return errno;

+	}

+	signal(SIGINT, cleanup);

+	while(*++argv) {

+		int fd = open(*argv, 0);

+

+		if(fd < 0) {

+			perror(*argv);

+			return errno;

+		}

+		printf("cl_mbox(%s) returns %d\n",

+			*argv, cl_mbox("/tmp/mboxtest", fd));

+		close(fd);

+	}

+	puts("Finished - don't forget to rm -rf /tmp/mboxtest");

+

+	exit(0);

+}

+