Browse code
bb11466 - let html be scanned raw when --scan-html=no is in effect.
Steven Morgan authored on 2016/01/13 07:20:26Showing 1 changed files
| ... | ... |
@@ -3181,7 +3181,7 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type) |
| 3181 | 3181 |
} |
| 3182 | 3182 |
|
| 3183 | 3183 |
/* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */ |
| 3184 |
- if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) {
|
|
| 3184 |
+ if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(SCAN_HTML) || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) {
|
|
| 3185 | 3185 |
res = cli_scanraw(ctx, type, typercg, &dettype, (ctx->engine->engine_options & ENGINE_OPTIONS_DISABLE_CACHE) ? NULL : hash); |
| 3186 | 3186 |
if(res != CL_CLEAN) {
|
| 3187 | 3187 |
switch(res) {
|