[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit e8c2df8fbdadcd546359fbd30fd509ef4c9fc573
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Feb 22 17:21:05 2010 +0200

    Be consistent about matcher_run (prefiltering) calls.
    
    cli_scanbuff called matcher_run for both troot and groot,
    fmap_scandesc only for one.

diff --git a/libclamav/matcher.c b/libclamav/matcher.c
index 54463db..548e9c5 100644
--- a/libclamav/matcher.c
+++ b/libclamav/matcher.c
@@ -506,8 +506,7 @@ int cli_fmap_scandesc(cli_ctx *ctx, cli_file_t ftype, uint8_t ftonly, struct cli
 	}
 
 	if(!ftonly) {
-	    if(groot->ac_only || (ret = cli_bm_scanbuff(buff, bytes, ctx->virname, NULL, groot, offset, map, NULL)) != CL_VIRUS)
-		ret = cli_ac_scanbuff(buff, bytes, ctx->virname, NULL, NULL, groot, &gdata, offset, ftype, ftoffset, acmode, NULL);
+	    ret = matcher_run(groot, buff, bytes, ctx->virname, &gdata, offset, ftype, ftoffset, acmode, map, NULL);
 	    if(ret == CL_VIRUS) {
 		cli_ac_freedata(&gdata);
 		if(troot) {

-- 
Debian repository for ClamAV