@@ -1,3 +1,7 @@

+Thu Apr  2 19:30:19 CEST 2009 (tk)

+----------------------------------

+ * libclamav/cab.c: fix compiler warnings (bb#1494)

+

 Thu Apr  2 18:48:58 CEST 2009 (tk)

 ----------------------------------

  * shared/optparser.c: handle deprecated freshclam's option --log-verbose

@@ -480,18 +480,8 @@ static int cab_read_block(int fd, struct cab_state *state, uint16_t resdata)

     }

     state->blklen = EC16(block_hdr.cbData);

-    if(state->blklen > CAB_INPUTMAX) {

-	cli_dbgmsg("cab_read_block: block size > CAB_INPUTMAX\n");

-	return CL_EFORMAT;

-    }

-

     state->outlen = EC16(block_hdr.cbUncomp);

-    if(state->outlen > CAB_BLOCKMAX) {

-	cli_dbgmsg("cab_read_block: output size > CAB_BLOCKMAX\n");

-	return CL_EFORMAT;

-    }

-

     if(cli_readn(fd, state->block, state->blklen) != state->blklen) {

 	cli_dbgmsg("cab_read_block: Can't read block data\n");

 	return CL_EFORMAT; /* most likely a corrupted file */