Suppress multiple viruses for BLOCKMAX edge case.

9 years ago · 90f29efa62
parent d70d4f5d00
commit 90f29efa62
1 changed files with 6 additions and 4 deletions
--- a/libclamav/others.c
+++ b/libclamav/others.c
@ -1092,10 +1092,12 @@ void cli_append_virus(cli_ctx * ctx, const char * virname)
 {
    if (ctx->virname == NULL)
        return;
-    if (ctx->engine->cb_virus_found)
-        ctx->engine->cb_virus_found(fmap_fd(*ctx->fmap), virname, ctx->cb_ctx);
-    ctx->num_viruses++;
-    *ctx->virname = virname;
+    if (ctx->limit_exceeded == 0 || SCAN_ALL) { 
+        if (ctx->engine->cb_virus_found)
+            ctx->engine->cb_virus_found(fmap_fd(*ctx->fmap), virname, ctx->cb_ctx);
+        ctx->num_viruses++;
+        *ctx->virname = virname;
+    }
 #if HAVE_JSON
    if (SCAN_PROPERTIES && ctx->wrkproperty) {
        json_object *arrobj, *virobj;