← Back to branch summary

~yolanda.robla/ubuntu/saucy/clamav/dep-8-tests

« back to all changes in this revision

Viewing changes to libclamav/cab.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman, Scott Kitterman, Jamie Strandboge
  • Date: 2009-04-10 21:57:17 UTC
  • Revision ID: james.westby@ubuntu.com-20090410215717-1rsik8ezsgkkeqom
Tags: 0.95.1+dfsg-0ubuntu1
https://launchpad.net/bugs/359301
[ Scott Kitterman ]
* New upstream bugfix release 
  - libclamav/others.h: harden CLI_ISCONTAINED macro (bb#1552)
  - libclamav/phishcheck.c: fix possible crash in cli_url_canon() (bb#1553)
  - Signficant clamav-milter bug fixes
  - Other fixes throughout
* Drop ArchiveLimitMemoryUsage option from clamav-base.postinst.in (option
  removed upstream)
* Add CommandReadTimeout, SendBufTimeout, and MaxQueue to
  clamav-base.postinst.in
* Add SkipAuthenticated to clamav-milter.postinst.in
* Drop unrar and lha from clamav Suggests since external unpackers are not
  supported since 0.94

[ Jamie Strandboge ]
* fix freshclam apparmor profile for klamav (LP: #359301)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/cab.c
480
480
    }
481
481
 
482
482
    state->blklen = EC16(block_hdr.cbData);
483
 
    if(state->blklen > CAB_INPUTMAX) {
484
 
        cli_dbgmsg("cab_read_block: block size > CAB_INPUTMAX\n");
485
 
        return CL_EFORMAT;
486
 
    }
487
 
 
488
483
    state->outlen = EC16(block_hdr.cbUncomp);
489
484
 
490
 
    if(state->outlen > CAB_BLOCKMAX) {
491
 
        cli_dbgmsg("cab_read_block: output size > CAB_BLOCKMAX\n");
492
 
        return CL_EFORMAT;
493
 
    }
494
 
 
495
485
    if(cli_readn(fd, state->block, state->blklen) != state->blklen) {
496
486
        cli_dbgmsg("cab_read_block: Can't read block data\n");
497
487
        return CL_EFORMAT; /* most likely a corrupted file */