← Back to branch summary

~ubuntu-branches/ubuntu/precise/clamav/precise-updates

« back to all changes in this revision

Viewing changes to libclamav/pe.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-01-30 09:01:52 UTC
  • mfrom: (118.1.5 precise-security)
  • Revision ID: package-import@ubuntu.com-20150130090152-es6oz6eg0wsa4r40
Tags: 0.98.6+dfsg-0ubuntu0.12.04.1
* Updated to 0.98.6 to fix security issues, including CVE-2014-9328.
* Removed upstreamed patches:
  - d/p/0002-Add-an-additional-n-after-the-number-in-the-pidfile.patch
  - d/p/0017-Bump-.so-version-number.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/pe.c
2570
2570
            cli_jsonstr(pe_json, "Packer", "yC");
2571
2571
#endif
2572
2572
 
2573
 
            cli_dbgmsg("%d,%d,%d,%d\n", nsections-1, e_lfanew, ecx, offset);
2574
 
            CLI_UNPTEMP("yC",(spinned,exe_sections,0));
2575
 
            CLI_UNPRESULTS("yC",(yc_decrypt(spinned, fsize, exe_sections, nsections-1, e_lfanew, ndesc, ecx, offset)),0,(spinned,0));
 
2573
            do {
 
2574
                unsigned int yc_unp_num_viruses = ctx->num_viruses;
 
2575
                const char *yc_unp_virname = NULL;
 
2576
 
 
2577
                if (ctx->virname)
 
2578
                    yc_unp_virname = ctx->virname[0];
 
2579
 
 
2580
                cli_dbgmsg("%d,%d,%d,%d\n", nsections-1, e_lfanew, ecx, offset);
 
2581
                CLI_UNPTEMP("yC",(spinned,exe_sections,0));
 
2582
                CLI_UNPRESULTS("yC",(yc_decrypt(ctx, spinned, fsize, exe_sections, nsections-1, e_lfanew, ndesc, ecx, offset)),0,(spinned,0));
 
2583
 
 
2584
                if (SCAN_ALL && yc_unp_num_viruses != ctx->num_viruses) {
 
2585
                    free(exe_sections);
 
2586
                    return CL_VIRUS;
 
2587
                }
 
2588
                else if (ctx->virname && yc_unp_virname != ctx->virname[0]) {
 
2589
                    free(exe_sections);
 
2590
                    return CL_VIRUS;
 
2591
                }
 
2592
            } while(0);
2576
2593
        }
2577
2594
    }
2578
2595