cid 12151/12150 - correct condition for checking allmatch in parsing msxml documents (revised)

10 years ago · f8f9d7e1f5
parent 5e7e16978d
commit f8f9d7e1f5
1 changed files with 1 additions and 1 deletions
--- a/libclamav/msxml_parser.c
+++ b/libclamav/msxml_parser.c
@ -376,7 +376,7 @@ static int msxml_parse_element(struct msxml_ctx *mxctx, xmlTextReaderPtr reader,
                    if (!(ctx->engine->keeptmp))
                        cli_unlink(tempfile);
                    free(tempfile);
-                    if (ret != CL_SUCCESS && (SCAN_ALL || ret != CL_VIRUS)) {
+                    if (ret != CL_SUCCESS && (ret != CL_VIRUS || (!SCAN_ALL && ret == CL_VIRUS))) {
                        return ret;
                    } else if (SCAN_ALL && ret == CL_VIRUS) {
                        virus = 1;