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

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit d2a0d381fcec9b531424aa0223e72067f037d50a
Author: aCaB <acab at clamav.net>
Date:   Thu Mar 4 23:48:16 2010 +0100

    don't cache negatives at ctx->maxXXXX

diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index 9864aa4..4b3cb09 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -1931,11 +1931,10 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)
 
 	if((ret = cli_fmap_scandesc(ctx, 0, 0, NULL, AC_SCAN_VIR, hash)) == CL_VIRUS)
 	    cli_dbgmsg("%s found in descriptor %d\n", *ctx->virname, desc);
-	else
-	    cache_add(hash, hashed_size, ctx);
-
+	else if(ctx->recursion != ctx->engine->maxreclevel)
+	    cache_add(hash, hashed_size, ctx); /* Only cache if limits are not reached */                                                  
 	funmap(*ctx->fmap);
-	ctx->fmap--; 
+	ctx->fmap--;
 	return ret;
     }
 

-- 
Debian repository for ClamAV