← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libclamav/scanners.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/scanners.c
2514
2514
            cli_dbgmsg("cli_magic_scandesc: file whitelisted by callback\n");
2515
2515
            perf_stop(ctx, PERFT_PRECB);
2516
2516
            ctx->hook_lsig_matches = old_hook_lsig_matches;
 
2517
            /* returns CL_CLEAN */
2517
2518
            *run_cleanup = 1;
 
2519
            break;
2518
2520
        case CL_VIRUS:
2519
2521
            cli_dbgmsg("cli_magic_scandesc: file blacklisted by callback\n");
2520
2522
            cli_append_virus(ctx, "Detected.By.Callback");
2522
2524
            ctx->hook_lsig_matches = old_hook_lsig_matches;
2523
2525
            *run_cleanup = 1;
2524
2526
            res = CL_VIRUS;
 
2527
            break;
2525
2528
        case CL_CLEAN:
2526
2529
            break;
2527
2530
        default:
2779
2782
#if HAVE_JSON
2780
2783
            if ((ctx->options & CL_SCAN_FILE_PROPERTIES) && (ctx->wrkproperty != NULL)) {
2781
2784
                ret = cli_process_ooxml(ctx);
2782
 
                if (ret == CL_ETIMEOUT) {
2783
 
                    return magic_scandesc_cleanup(ctx, type, hash, hashed_size, cache_clean, ret, parent_property);
 
2785
                if (ret == CL_EMEM || ret == CL_ENULLARG) {
 
2786
                    /* critical error */
 
2787
                    break;
2784
2788
                }
2785
2789
                else if (ret != CL_SUCCESS) {
2786
 
                    /* JSONOOXML - what to do if something else fails? placeholder */
 
2790
                    /* allow for the CL_TYPE_ZIP scan to occur; cli_process_ooxml other possible returns: */
 
2791
                    /* CL_ETIMEOUT, CL_EMAXSIZE, CL_EMAXFILES, CL_EPARSE, CL_EFORMAT, CL_BREAK, CL_ESTAT  */
2787
2792
                    ret = CL_SUCCESS;
2788
2793
                }
2789
2794
            }