[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 7d54e2314997bad2ca89cfe67f6f156ef061a76a
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Dec 28 23:28:04 2009 +0100

    sigtool/sigtool.c: properly handle anchored sigs (bb#1780)

diff --git a/ChangeLog b/ChangeLog
index c71b341..7d1e82f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 28 23:27:40 CET 2009 (tk)
+---------------------------------
+ * sigtool/sigtool.c: properly handle anchored sigs (bb#1780)
+
 Tue Dec 22 09:32:33 EET 2009 (edwin)
 ------------------------------------
  * libclamav/fmap.h: fix build on FreeBSD and Mac OS X (bb #1776). Thanks to
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 09383cf..a3910a1 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -2051,15 +2051,15 @@ static int decodesig(char *sig, int fd)
 	    mprintf(" * SUBSIG ID %d\n", i);
 	    if((pt = strchr(tokens[3 + i], ':'))) {
 		*pt++ = 0;
-		mprintf(" +-> OFFSET: %s\n", pt);
+		mprintf(" +-> OFFSET: %s\n", tokens[3 + i]);
 	    } else {
 		mprintf(" +-> OFFSET: ANY\n");
 	    }
 	    if(fd == -1) {
 		mprintf(" +-> DECODED SUBSIGNATURE:\n");
-		decodehex(tokens[3 + i]);
+		decodehex(pt ? pt : tokens[3 + i]);
 	    } else {
-		mprintf(" +-> MATCH: %s\n", matchsig(tokens[3 + i], fd) ? "YES" : "** NO **");
+		mprintf(" +-> MATCH: %s\n", matchsig(pt ? pt : tokens[3 + i], fd) ? "YES" : "** NO **");
 	    }
 	}
     } else if(strchr(sig, ':')) { /* ndb */

-- 
Debian repository for ClamAV