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

aCaB acab at clamav.net
Sun Apr 4 01:20:06 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit 2587dbab71e67362954645d2f587292f340f7db5
Author: aCaB <acab at clamav.net>
Date:   Mon Feb 15 02:02:54 2010 +0100

    call checkfp before unmapping - just in case

diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index 1fd822b..aad4c27 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -2231,15 +2231,15 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)
 	default:
 	    break;
     }
+
+    if(ret == CL_VIRUS)
+	ret = cli_checkfp(hash, hashed_size, ctx);
     ctx->recursion--;
     funmap(*ctx->fmap);
     ctx->fmap--;
     cli_bitset_free(ctx->hook_lsig_matches);
     ctx->hook_lsig_matches = old_hook_lsig_matches;
 
-    if(ret == CL_VIRUS)
-	ret = cli_checkfp(hash, hashed_size, ctx);
-
     switch(ret) {
 	case CL_EFORMAT:
 	case CL_EMAXREC:

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list