From 433c3bb4103030a8b1fed81b584e879b283e8b40 Mon Sep 17 00:00:00 2001 From: Steven Morgan Date: Tue, 12 Jan 2016 17:20:26 -0500 Subject: [PATCH] bb11466 - let html be scanned raw when --scan-html=no is in effect. --- libclamav/scanners.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libclamav/scanners.c b/libclamav/scanners.c index b48f584c3..57e31fa23 100644 --- a/libclamav/scanners.c +++ b/libclamav/scanners.c @@ -3181,7 +3181,7 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type) } /* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */ - if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) { + if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(SCAN_HTML) || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) { res = cli_scanraw(ctx, type, typercg, &dettype, (ctx->engine->engine_options & ENGINE_OPTIONS_DISABLE_CACHE) ? NULL : hash); if(res != CL_CLEAN) { switch(res) {