[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 4e968cd31d98781ed2a33744de23972d526c0664
Author: aCaB <acab at clamav.net>
Date:   Mon Dec 7 20:06:07 2009 +0100

    add ccount

diff --git a/libclamav/pe_icons.c b/libclamav/pe_icons.c
index 1937aef..9e87585 100644
--- a/libclamav/pe_icons.c
+++ b/libclamav/pe_icons.c
@@ -1081,7 +1081,8 @@ static int getmetrics(unsigned int side, unsigned int *imagedata, struct icomtr
 	}
 	sprintf(ptr, "%02x", res->rsum); ptr+=2;
 	sprintf(ptr, "%02x", res->gsum); ptr+=2;
-	sprintf(ptr, "%02x", res->bsum);
+	sprintf(ptr, "%02x", res->bsum); ptr+=2;
+	sprintf(ptr, "%02x", res->ccount);
 	cli_dbgmsg("ICO SIGNATURE: ICON.NAME:%s\n", mstr);
 
     }
diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index f2790c2..1d7e744 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -547,7 +547,7 @@ static int cli_loadidb(FILE *fs, struct cl_engine *engine, unsigned int *signo,
 	    break;
 	}
 
-	if(strlen(tokens[1]) != 122) {
+	if(strlen(tokens[1]) != 124) {
 	    ret = CL_EMALFDB;
 	    break;
 	}
@@ -556,7 +556,7 @@ static int cli_loadidb(FILE *fs, struct cl_engine *engine, unsigned int *signo,
 	    continue;
 
 	hash = (uint8_t *)tokens[1];
-	if(cli_hexnibbles((char *)hash, 122)) {
+	if(cli_hexnibbles((char *)hash, 124)) {
 	    cli_errmsg("cli_loadidb: Malformed hash at line %u (bad chars)\n", line);
 	    ret = CL_EMALFDB;
 	    break;

-- 
Debian repository for ClamAV