[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 c5ed82baca2d0fd605a483c87ef3bb16c01f1c42
Author: aCaB <acab at clamav.net>
Date:   Sat Mar 6 03:10:03 2010 +0100

    cache.c cleanup and minor fixes

diff --git a/libclamav/cache.c b/libclamav/cache.c
index 5a7b285..7a0c6fd 100644
--- a/libclamav/cache.c
+++ b/libclamav/cache.c
@@ -692,6 +692,7 @@ void cache_add(unsigned char *md5, size_t size, cli_ctx *ctx) {
     if(!ctx || !ctx->engine || !ctx->engine->cache)
        return;
 
+    level =  (*ctx->fmap && (*ctx->fmap)->dont_cache_flag) ? ctx->recursion : 0;
     c = &ctx->engine->cache[key];
     if(pthread_mutex_lock(&c->mutex)) {
 	cli_errmsg("cli_add: mutex lock fail\n");
@@ -709,7 +710,6 @@ void cache_add(unsigned char *md5, size_t size, cli_ctx *ctx) {
 #endif
 
     pthread_mutex_unlock(&c->mutex);
-    level =  (*ctx->fmap && (*ctx->fmap)->dont_cache_flag) ? ctx->recursion : 0;
     cli_dbgmsg("cache_add: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x (level %u)\n", md5[0], md5[1], md5[2], md5[3], md5[4], md5[5], md5[6], md5[7], md5[8], md5[9], md5[10], md5[11], md5[12], md5[13], md5[14], md5[15], level);
     return;
 }

-- 
Debian repository for ClamAV