Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 18:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

backwards compatibility for target type 13 json scanning

Browse source
This commit is contained in:
Kevin Lin 2015-03-04 12:08:34 -05:00
parent 116169833d
commit 514dfa1e96
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libclamav/scanners.c
View file

@ -3467,9 +3467,8 @@ static int scan_common(int desc, cl_fmap_t *map, const char **virname, unsigned
int ret = CL_SUCCESS; int ret = CL_SUCCESS;
cli_dbgmsg("%s\n", jstring); cli_dbgmsg("%s\n", jstring);
/* Scan the json string unless a virus was detected */
if (rc != CL_VIRUS) { if (rc != CL_VIRUS) {
/* CONSTRUCTION */ /* run bytecode preclass hook; generate fmap if needed for running hook */
struct cli_bc_ctx *bc_ctx = cli_bytecode_context_alloc(); struct cli_bc_ctx *bc_ctx = cli_bytecode_context_alloc();
if (!bc_ctx) { if (!bc_ctx) {
cli_errmsg("scan_common: can't allocate memory for bc_ctx\n"); cli_errmsg("scan_common: can't allocate memory for bc_ctx\n");
@ -3496,8 +3495,13 @@ static int scan_common(int desc, cl_fmap_t *map, const char **virname, unsigned
funmap(pc_map); funmap(pc_map);
} }
} }
//ctx.options &= ~CL_SCAN_FILE_PROPERTIES;
//rc = cli_mem_scandesc(jstring, strlen(jstring), &ctx); /* backwards compatibility: scan the json string unless a virus was detected */
if (rc != CL_VIRUS && ctx.engine->root[13]->ac_lsigs) {
cli_warnmsg("scan_common: running depeciated preclass bytecodes for target type 13\n");
ctx.options &= ~CL_SCAN_FILE_PROPERTIES;
rc = cli_mem_scandesc(jstring, strlen(jstring), &ctx);
}
} }
/* Invoke file props callback */ /* Invoke file props callback */