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

+Thu Aug 19 22:06:35 CEST 2004 (tk)

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

+  * libclamav/matcher-bm.c: stop and report error if signature is shorter than

+			    BM_MIN_LENGTH (main.cvd:25 is now required)

+

 Wed Aug 18 22:38:39 BST 2004 (njh)

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

   * libclamav/mbox.c:	Multithread the followURL code - URLs are now followed					in parallel

@@ -21,7 +21,7 @@

 #include <ctype.h>

 #include <stdlib.h>

-#define MINLENGTH 10 /* only optimize signatures longer than MINLENGT */

+#define MINLENGTH 40 /* only optimize signatures longer than MINLENGT */

 #define FILEBUFF 16384

 #define ANALYZE 6 /* only analyze first ANALYZE characters */

@@ -36,9 +36,8 @@ int cli_bm_addpatt(struct cl_node *root, struct cli_bm_patt *pattern)

     if(pattern->length < BM_MIN_LENGTH) {

-	cli_dbgmsg("Ignoring signature for %s (too short)\n", pattern->virname);

-	/* return CL_EPATSHORT; */

-	return 0;

+	cli_errmsg("Signature for %s is too short\n", pattern->virname);

+	return CL_EPATSHORT;

     }

     for(i = BM_MIN_LENGTH - BM_BLOCK_SIZE; i >= 0; i--) {