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

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 380ae30458b7cedf66412c6808467cf8a73578f3
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Feb 10 16:58:13 2010 +0200

    fix prefiltering build.

diff --git a/libclamav/filtering.c b/libclamav/filtering.c
index e6f4437..2e5d501 100644
--- a/libclamav/filtering.c
+++ b/libclamav/filtering.c
@@ -451,11 +451,11 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
 					spec->alt = pat->special_table[altcnt-1];
 					break;
 				    default:
+					stop = 1;
 					break;
 					/* TODO: should something be done here?
 					 * */
 				}
-				stop = 1;
 				break;
 			case CLI_MATCH_NIBBLE_HIGH:
 				spec->start = (p & 0xf0);
diff --git a/libclamav/matcher-ac.c b/libclamav/matcher-ac.c
index dff56d4..b0904a7 100644
--- a/libclamav/matcher-ac.c
+++ b/libclamav/matcher-ac.c
@@ -359,6 +359,8 @@ int cli_ac_buildtrie(struct cli_matcher *root)
 	return CL_SUCCESS;
     }
 
+    if (root->filter)
+	cli_warnmsg("Using filter for trie %d\n", root->type);
     return ac_maketrans(root);
 }
 
@@ -1693,6 +1695,7 @@ int cli_ac_addsig(struct cli_matcher *root, const char *virname, const char *hex
 	    mpool_free(root->mempool, root->filter);
 	    root->filter = NULL;
 	}
+	/* TODO: should this affect maxpatlen? */
     }
 
     for(i = 0; i < root->ac_maxdepth && i < new->length; i++) {
diff --git a/libclamav/matcher-bm.c b/libclamav/matcher-bm.c
index f6b510a..4bc33a8 100644
--- a/libclamav/matcher-bm.c
+++ b/libclamav/matcher-bm.c
@@ -70,6 +70,7 @@ int cli_bm_addpatt(struct cli_matcher *root, struct cli_bm_patt *pattern, const
 	    mpool_free(root->mempool, root->filter);
 	    root->filter = NULL;
 	}
+	/* TODO: should this affect maxpatlen? */
     }
 
 #if BM_MIN_LENGTH == BM_BLOCK_SIZE
diff --git a/libclamav/perflogging.h b/libclamav/perflogging.h
index 07959d2..9669e74 100644
--- a/libclamav/perflogging.h
+++ b/libclamav/perflogging.h
@@ -34,6 +34,7 @@
 #else
 /*TODO: maybe we need a GCC version check too here */
 #include <pthread.h>
+#include <assert.h>
 #include "cltypes.h"
 
 enum perf_log_sumable {

-- 
Debian repository for ClamAV