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

+Wed Sep 15 18:46:44 CEST 2004 (tk)

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

+  * libclamav/matcher.c: fix problem with uninitialised voffset structure

+			 (thanks to Nigel)

+  * libclamav/str.c: check if memory is correctly allocated (thanks to Trog)

+

 Wed Sep 15 13:27:24 BST 2004 (trog)

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

   * libclamav/htmlnorm.c: Error path cleanup. Fix bug spotted by Nigel.

@@ -118,6 +118,8 @@ int cli_scandesc(int desc, const char **virname, long int *scanned, const struct

     if(root->md5_hlist)

 	MD5Init(&ctx);

+    memset(&voffset, 0, sizeof(struct cli_voffset));

+

     buff = buffer;

     buff += root->maxpatlen; /* pointer to read data block */

     endbl = buff + SCANBUFF - root->maxpatlen; /* pointer to the last block

@@ -142,15 +144,15 @@ int cli_scandesc(int desc, const char **virname, long int *scanned, const struct

 	    if(voffset.target) {

 		if(voffset.target >= TARGET_TABLE_SIZE) {

-		    cli_errmsg("Bad target (%d) in signature for %s\n", voffset.target, virname);

+		    cli_errmsg("Bad target (%d) in signature for %s\n", voffset.target, *virname);

 		} else if(ftype && ftype != CL_TYPE_UNKNOWN_TEXT) {

 		    if(targettab[voffset.target] != ftype) {

-			cli_dbgmsg("Expected target type (%d) for %s != %d\n", voffset.target, virname, ftype);

+			cli_dbgmsg("Expected target type (%d) for %s != %d\n", voffset.target, *virname, ftype);

 			return CL_CLEAN;

 		    }

 		} else if(type) {

 		    if(targettab[voffset.target] != type) {

-			cli_dbgmsg("Expected target type (%d) for %s != %d\n", voffset.target, virname, type);

+			cli_dbgmsg("Expected target type (%d) for %s != %d\n", voffset.target, *virname, type);

 			return CL_CLEAN;

 		    }

 		}

@@ -665,7 +665,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, unsigned int *signo)

 	ret = cli_cvdload(fd, root, signo, warn);

-    } else if(cli_strbcasestr(filename, ".hdb")) {

+    } else if(cli_strbcasestr(filename, ".hdb") || cli_strbcasestr(filename, ".hdb2")) {

 	ret = cli_loadhdb(fd, root, signo);

     } else if(cli_strbcasestr(filename, ".ndb")) {

@@ -704,11 +704,12 @@ int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo

 #endif

 	{

 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") &&

-	    (cli_strbcasestr(dent->d_name, ".db")  ||

-	     cli_strbcasestr(dent->d_name, ".db2") ||

-	     cli_strbcasestr(dent->d_name, ".db3") ||

-	     cli_strbcasestr(dent->d_name, ".hdb") ||

-	     cli_strbcasestr(dent->d_name, ".ndb") ||

+	    (cli_strbcasestr(dent->d_name, ".db")   ||

+	     cli_strbcasestr(dent->d_name, ".db2")  ||

+	     cli_strbcasestr(dent->d_name, ".db3")  ||

+	     cli_strbcasestr(dent->d_name, ".hdb")  ||

+	     cli_strbcasestr(dent->d_name, ".hdb2") ||

+	     cli_strbcasestr(dent->d_name, ".ndb")  ||

 	     cli_strbcasestr(dent->d_name, ".cvd"))) {

 		dbfile = (char *) cli_calloc(strlen(dent->d_name) + strlen(dirname) + 2, sizeof(char));

@@ -772,6 +773,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 	    cli_strbcasestr(dent->d_name, ".db2")  || 

 	    cli_strbcasestr(dent->d_name, ".db3")  || 

 	    cli_strbcasestr(dent->d_name, ".hdb")  || 

+	    cli_strbcasestr(dent->d_name, ".hdb2") || 

 	    cli_strbcasestr(dent->d_name, ".ndb")  || 

 	    cli_strbcasestr(dent->d_name, ".cvd"))) {

@@ -820,6 +822,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 	    cli_strbcasestr(dent->d_name, ".db2")  || 

 	    cli_strbcasestr(dent->d_name, ".db3")  || 

 	    cli_strbcasestr(dent->d_name, ".hdb")  || 

+	    cli_strbcasestr(dent->d_name, ".hdb2") || 

 	    cli_strbcasestr(dent->d_name, ".ndb")  || 

 	    cli_strbcasestr(dent->d_name, ".cvd"))) {

@@ -224,6 +224,8 @@ char *cli_strtok(const char *line, int fieldno, const char *delim)

 	return NULL;

     }

     buffer = malloc(j-i+1);

+    if(!buffer)

+	return NULL;

     strncpy(buffer, line+i, j-i);

     buffer[j-i] = '\0';

@@ -236,7 +236,7 @@ int build(struct optstruct *opt)

 	exit(1);

     }

-    if(stat("viruses.db", &foo) == -1 && stat("viruses.db2", &foo) == -1 && stat("malware.hdb", &foo) == -1) {

+    if(stat("viruses.db", &foo) == -1 && stat("viruses.db2", &foo) == -1 && stat("malware.hdb", &foo) == -1 && stat("malware.hdb2", &foo)) {

 	mprintf("Virus database not found in current working directory.\n");

 	exit(1);

     }

@@ -256,7 +256,7 @@ int build(struct optstruct *opt)

 	mprintf("WARNING: There are no signatures in the database(s).\n");

     } else {

 	mprintf("Signatures: %d\n", no);

-	realno = countlines("viruses.db") + countlines("viruses.db2") + countlines("malware.hdb");

+	realno = countlines("viruses.db") + countlines("viruses.db2") + countlines("malware.hdb") + countlines("malware.hdb2");

 	if(realno != no) {

 	    mprintf("!Signatures in database: %d. Loaded: %d.\n", realno, no);

@@ -274,7 +274,7 @@ int build(struct optstruct *opt)

 	    exit(1);

 	case 0:

 	    {

-		char *args[] = { "tar", "-cvf", NULL, "COPYING", "viruses.db", "viruses.db2", "Notes", "viruses.db3", "malware.hdb", NULL };

+		char *args[] = { "tar", "-cvf", NULL, "COPYING", "viruses.db", "viruses.db2", "Notes", "viruses.db3", "malware.hdb", "malware.hdb2", NULL };

 		args[2] = tarfile;

 		execv("/bin/tar", args);

 		mprintf("!Can't execute tar\n");

@@ -664,7 +664,7 @@ int listdb(const char *filename)

 	    mprintf("%s\n", start);

 	}

-    } else if(cli_strbcasestr(filename, ".hdb")) {

+    } else if(cli_strbcasestr(filename, ".hdb") || cli_strbcasestr(filename, ".hdb2")) {

 	while(fgets(buffer, FILEBUFF, fd)) {

 	    line++;

@@ -713,6 +713,7 @@ int listdir(const char *dirname)

 	    (cli_strbcasestr(dent->d_name, ".db")  ||

 	     cli_strbcasestr(dent->d_name, ".db2") ||

 	     cli_strbcasestr(dent->d_name, ".hdb") ||

+	     cli_strbcasestr(dent->d_name, ".hdb2") ||

 	     cli_strbcasestr(dent->d_name, ".cvd"))) {

 		dbfile = (char *) mcalloc(strlen(dent->d_name) + strlen(dirname) + 2, sizeof(char));