[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 9d8868627833a6669b8700a52cb2c7ccca68f961
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Thu Mar 4 17:33:45 2010 +0100

    libclamav/matcher-bm.c: fix array check (bb#1840)

diff --git a/ChangeLog b/ChangeLog
index a82d59f..f447ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar  4 17:33:18 CET 2010 (tk)
+---------------------------------
+ * libclamav/matcher-bm.c: fix array check (bb#1840)
+
 Thu Mar  4 15:32:40 CET 2010 (tk)
 ---------------------------------
  * libclamav/scanners.c: set container type in cli_scanraw() (bb#1842)
diff --git a/libclamav/matcher-bm.c b/libclamav/matcher-bm.c
index ee5011c..6c445df 100644
--- a/libclamav/matcher-bm.c
+++ b/libclamav/matcher-bm.c
@@ -195,7 +195,7 @@ int cli_bm_initoff(const struct cli_matcher *root, struct cli_bm_off *data, fmap
 	    free(data->offset);
 	    return ret;
 	} else if((data->offset[patt->offset_min] != CLI_OFF_NONE) && (data->offset[patt->offset_min] + patt->length <= info.fsize)) {
-	    if(!data->cnt || (data->offset[patt->offset_min] != data->offtab[data->cnt - 1])) {
+	    if(!data->cnt || (data->offset[patt->offset_min] + patt->prefix_length != data->offtab[data->cnt - 1])) {
 		data->offtab[data->cnt] = data->offset[patt->offset_min] + patt->prefix_length;
 		if(data->offtab[data->cnt] >= map->len)
 		    continue;

-- 
Debian repository for ClamAV