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

+Wed Jul 14 13:31:41 CEST 2004 (tk)

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

+  * libclamav: fix detection of mail files

+

 Wed Jul 14 11:17:58 BST 2004 (njh)

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

   * clamav-milter:	Added --dont-wait and --advisory options

@@ -6,6 +6,6 @@ includedir=@includedir@

 Name: libclamav

 Description: A GPL virus scanner

 Version: @LIBCLAMAV_VERSION@

-Libs: -L${libdir} @LIBCLAMAV_LIBS@

+Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@

 Cflags: -I${includedir} @CFLAGS@

@@ -300,9 +300,10 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 				if(++partcnt[pt->sigid] == pt->parts) { /* the last one */

 				    if(pt->type) {

 					if(typerec) {

-					    cli_dbgmsg("Matched signature for file type: %s\n", pt->virname);

-					    if(pt->type > type)

+					    if(pt->type > type) {

+						cli_dbgmsg("Matched signature for file type: %s\n", pt->virname);

 						type = pt->type;

+					    }

 					}

 				    } else {

 					if(virname)

@@ -317,8 +318,11 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 		    } else { /* old type signature */

 			if(pt->type) {

 			    if(typerec) {

-				cli_dbgmsg("Matched signature for file type: %s\n", pt->virname);

-				type = pt->type;

+				if(pt->type > type) {

+				    cli_dbgmsg("Matched signature for file type: %s\n", pt->virname);

+

+				    type = pt->type;

+				}

 			    }

 			} else {

 			    if(virname)

@@ -89,7 +89,7 @@ static int cli_addsig(struct cl_node *root, const char *virname, const char *hex

 	    *start++ = 0;

 	    new->alt++;

-	    new->altn = (unsigned short int *) realloc(new->altn, new->alt);

+	    new->altn = (unsigned short int *) realloc(new->altn, new->alt * sizeof(unsigned short int));

 	    new->altn[new->alt - 1] = 0;

 	    new->altc = (char **) realloc(new->altc, new->alt);