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

+Mon Sep 26 19:40:14 CEST 2005 (tk)

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

+  * libclamav/matcher.c: cl_build: cli_addtypesigs was corrupting AC trie in

+			 engine->root[0]

+

 Fri Sep 23 04:05:07 CEST 2005 (tk)

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

   * libclamav/clamav.h: split cl_node into cli_matcher and cl_engine

@@ -449,7 +449,6 @@ int cli_scandesc(int desc, const char **virname, long int *scanned, const struct

 		pt += 2;

 	    }

 	    md5str[32] = 0;

-	    cli_dbgmsg("Calculated MD5 checksum: %s\n", md5str);

 	}

 	if((md5_node = cli_vermd5(digest, engine)) && !md5_node->fp) {

@@ -477,14 +476,15 @@ int cl_build(struct cl_engine *engine)

 	int i, ret;

 	struct cli_matcher *root;

+

+    if((ret = cli_addtypesigs(engine)))

+	return ret;

+

     for(i = 0; i < CL_TARGET_TABLE_SIZE; i++)

 	if((root = engine->root[i]))

 	    cli_ac_buildtrie(root);

     /* FIXME: check return values of cli_ac_buildtree */

-    if((ret = cli_addtypesigs(engine)))

-	return ret;

-

     return 0;

 }