[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 ef1152a6e87b28a0d08803e6bb90f9e6d7beb62a
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Tue Dec 1 23:49:51 2009 +0100

    handle floating chars

diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 5678bd6..c9fc963 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1838,12 +1838,12 @@ static int decodehex(const char *hexsig)
 
 
     hexlen = strlen(hexsig);
-    if(strchr(hexsig, '{')) {
+    if(strchr(hexsig, '{') || strchr(hexsig, '[')) {
 	if(!(hexcpy = strdup(hexsig)))
 	    return -1;
 
 	for(i = 0; i < hexlen; i++)
-	    if(hexsig[i] == '{' || hexsig[i] == '*')
+	    if(hexsig[i] == '{' || hexsig[i] == '[' || hexsig[i] == '*')
 		parts++;
 
 	if(parts)
@@ -1853,7 +1853,7 @@ static int decodehex(const char *hexsig)
 	for(i = 1; i <= parts; i++) {
 	    if(i != parts) {
 		for(j = 0; j < strlen(start); j++) {
-		    if(start[j] == '{') {
+		    if(start[j] == '{' || start[j] == '[') {
 			asterisk = 0;
 			pt = start + j;
 			break;
@@ -1898,7 +1898,7 @@ static int decodehex(const char *hexsig)
 		continue;
 	    }
 
-	    if(!(start = strchr(pt, '}'))) {
+	    if(!(start = strchr(pt, '}')) && !(start = strchr(pt, ']'))) {
 		error = 1;
 		break;
 	    }

-- 
Debian repository for ClamAV