@@ -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)

@@ -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;