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

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 545247afb07a0b8b8b1e61b787e60d1786621d05
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Thu Jan 14 19:44:56 2010 +0100

    libclamav/readdb.c: fix compatibility issue with .zmd sigs (bb#1793)

diff --git a/ChangeLog b/ChangeLog
index 8e3534e..5df789e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 14 19:43:43 CET 2010 (tk)
+---------------------------------
+ * libclamav/readdb.c: fix compatibility issue with .zmd sigs (bb#1793)
+
 Tue Jan 12 14:39:55 CET 2010 (tk)
 ---------------------------------
  * libclamav: allow lsigs be anchored to specific containers (bb#1293),
diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index cf3cb96..e479f0f 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -1813,7 +1813,7 @@ static int cli_loadmd(FILE *fs, struct cl_engine *engine, unsigned int *signo, i
 	    continue;
 	}
 
-	new->encrypted = atoi(tokens[1]);
+	new->encrypted = strcmp(tokens[1], "*") ? atoi(tokens[1]) : 2;
 
 	if(strcmp(tokens[2], "*") && cli_regcomp(&new->name, tokens[2], REG_EXTENDED | REG_NOSUB)) {
 	    cli_errmsg("cli_loadmd: Can't compile regular expression %s in signature for %s\n", tokens[2], tokens[0]);
@@ -1848,8 +1848,7 @@ static int cli_loadmd(FILE *fs, struct cl_engine *engine, unsigned int *signo, i
 
 	/* tokens[6] - not used */
 
-	if(strcmp(tokens[7], "*"))
-	    new->filepos[0] = new->filepos[1] = atoi(tokens[7]);
+	new->filepos[0] = new->filepos[1] = strcmp(tokens[7], "*") ? atoi(tokens[7]) : CLI_OFF_ANY;
 
 	/* tokens[8] - not used */
 

-- 
Debian repository for ClamAV