[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 71d4228fd8c0f877d7d5cbaf72a1d229f3ea18ce
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:15 2008 +0100

    Revert "libclamav/matcher-ac.c: fix handling of nodes which also match single bytes (bb#1054)"
    
    This reverts commit 87f7b95f10bb4ce4693caf6da1f49c9e917d545b.

diff --git a/ChangeLog b/ChangeLog
index 6ab3742..dd1afed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Tue Jul  1 14:13:21 CEST 2008 (tk)
-----------------------------------
-  * libclamav/matcher-ac.c: fix handling of nodes which also match single
-			    bytes (bb#1054)
-
 Tue Jul  1 13:41:49 CEST 2008 (tk)
 ----------------------------------
   * libclamav: faster loading of uncompressed .cld files, also fixes bb#1064
diff --git a/libclamav/matcher-ac.c b/libclamav/matcher-ac.c
index 1422e86..ad56f91 100644
--- a/libclamav/matcher-ac.c
+++ b/libclamav/matcher-ac.c
@@ -126,7 +126,7 @@ int cli_ac_addpatt(struct cli_matcher *root, struct cli_ac_patt *pattern)
 
     ph = pt->list;
     while(ph) {
-	if((ph->length == pattern->length) && (ph->prefix_length == pattern->prefix_length) && (ph->ch[0] == pattern->ch[0]) && (ph->ch[1] == pattern->ch[1])) {
+	if((ph->length == pattern->length) && (ph->prefix_length == pattern->prefix_length)) {
 	    if(!memcmp(ph->pattern, pattern->pattern, ph->length * sizeof(uint16_t)) && !memcmp(ph->prefix, pattern->prefix, ph->prefix_length * sizeof(uint16_t))) {
 		if(!ph->alt && !pattern->alt) {
 		    match = 1;

-- 
Debian repository for ClamAV