@@ -1,3 +1,7 @@

+Mon Oct 18 15:52:47 CEST 2010 (tk)

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

+ * libclamav/matcher.c: fix stack smash with HandlerType (bb#2298)

+

 Mon Oct 18 11:30:01 CEST 2010 (tk)

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

  * clamdscan: fix name parsing in normal mode (bb#2328)

@@ -532,8 +532,12 @@ int cli_lsig_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_data *ac

 	    }

 	    if(root->ac_lsigtable[i]->tdb.handlertype) {

-		if(cli_magic_scandesc_type(map->fd, ctx, root->ac_lsigtable[i]->tdb.handlertype[0]) == CL_VIRUS)

+		ctx->recursion++;

+		if(cli_magic_scandesc_type(map->fd, ctx, root->ac_lsigtable[i]->tdb.handlertype[0]) == CL_VIRUS) {

+		    ctx->recursion--;

 		    return CL_VIRUS;

+		}

+		ctx->recursion--;

 		continue;

 	    }