← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libclamav/ole2_extract.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/ole2_extract.c
358
358
    if (!hdr || !cli_debug_flag) {
359
359
        return;
360
360
    }
361
 
    cli_dbgmsg("\nMagic:\t\t\t0x");
362
 
    for (i = 0; i < 8; i++) {
363
 
        cli_dbgmsg("%x", hdr->magic[i]);
364
 
    }
365
361
    cli_dbgmsg("\n");
 
362
    cli_dbgmsg("Magic:\t\t\t0x%x%x%x%x%x%x%x%x\n",
 
363
               hdr->magic[0], hdr->magic[1], hdr->magic[2], hdr->magic[3],
 
364
               hdr->magic[4], hdr->magic[5], hdr->magic[6], hdr->magic[7]);
366
365
 
367
 
    cli_dbgmsg("CLSID:\t\t\t{");
368
 
    for (i = 0; i < 16; i++) {
369
 
        cli_dbgmsg("%x ", hdr->clsid[i]);
370
 
    }
371
 
    cli_dbgmsg("}\n");
 
366
    cli_dbgmsg("CLSID:\t\t\t{%x%x%x%x-%x%x-%x%x-%x%x-%x%x%x%x%x%x}\n",
 
367
               hdr->clsid[0],  hdr->clsid[1],  hdr->clsid[2],  hdr->clsid[3],
 
368
               hdr->clsid[4],  hdr->clsid[5],  hdr->clsid[6],  hdr->clsid[7],
 
369
               hdr->clsid[8],  hdr->clsid[9],  hdr->clsid[10], hdr->clsid[11],
 
370
               hdr->clsid[12], hdr->clsid[13], hdr->clsid[14], hdr->clsid[15]);
372
371
 
373
372
    cli_dbgmsg("Minor version:\t\t0x%x\n", hdr->minor_version);
374
373
    cli_dbgmsg("DLL version:\t\t0x%x\n", hdr->dll_version);
375
374
    cli_dbgmsg("Byte Order:\t\t%d\n", hdr->byte_order);
376
 
    cli_dbgmsg("Big Block Size:\t\t%i\n", hdr->log2_big_block_size);
 
375
    cli_dbgmsg("Big Block Size:\t%i\n", hdr->log2_big_block_size);
377
376
    cli_dbgmsg("Small Block Size:\t%i\n", hdr->log2_small_block_size);
378
377
    cli_dbgmsg("BAT count:\t\t%d\n", hdr->bat_count);
379
378
    cli_dbgmsg("Prop start:\t\t%d\n", hdr->prop_start);
381
380
    cli_dbgmsg("SBat start:\t\t%d\n", hdr->sbat_start);
382
381
    cli_dbgmsg("SBat block count:\t%d\n", hdr->sbat_block_count);
383
382
    cli_dbgmsg("XBat start:\t\t%d\n", hdr->xbat_start);
384
 
    cli_dbgmsg("XBat block count:\t%d\n\n", hdr->xbat_count);
 
383
    cli_dbgmsg("XBat block count:\t%d\n", hdr->xbat_count);
 
384
    cli_dbgmsg("\n");
385
385
    return;
386
386
}
387
387