@@ -1,3 +1,8 @@

+Sat Jun 17 21:17:20 CEST 2006 (tk)

+----------------------------------

+  * libclamav/matcher-bm.c: minor optimization patch (~7% speed up) from

+			    Christophe Poujol <christophe.poujol*atosorigin.com>

+

 Fri Jun 16 16:03:45 CEST 2006 (tk)

 ----------------------------------

   * libclamav/readdb.c: fix small memory leak in cl_free()

@@ -132,6 +132,7 @@ void cli_bm_free(struct cli_matcher *root)

 int cli_bm_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cli_matcher *root, unsigned long int offset, unsigned short ftype, int fd)

 {

 	unsigned int i, j, shift, off, found = 0;

+	int idxtest;

 	uint16_t idx;

 	struct cli_bm_patt *p;

 	const char *bp;

@@ -168,6 +169,14 @@ int cli_bm_scanbuff(const char *buffer, unsigned int length, const char **virnam

 		}

 #endif

+		idxtest = MIN (p->length, length - off ) - 1;

+		if(idxtest >= 0) {

+		    if(bp[idxtest] != p->pattern[idxtest]) {

+			p = p->next;

+			continue;

+		    }

+		}

+

 		found = 1;

 		for(j = 0; j < p->length && off < length; j++, off++) {

 		    if(bp[j] != p->pattern[j]) {