@@ -1,3 +1,8 @@

+Wed Jul 20 03:41:00 CEST 2005 (tk)

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

+  * libclamav/mspack: some cab archives were not properly decompressed (problem

+		      reported by Diego d'Ambra <diego*clamav.net>)

+

 Tue Jul 19 22:35:02 CEST 2005 (tk)

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

   * libclamav/pe.c: cli_peheader: sync entry point calculation with cli_scanpe

@@ -1264,7 +1264,7 @@ static int cabd_sys_read(struct mspack_file *file, void *buffer, int bytes) {

       /* check if we're out of input blocks, advance block counter */

       if (this->d->block++ >= this->d->folder->base.num_blocks) {

 	this->error = MSPACK_ERR_DATAFORMAT;

-	return -1;

+	break;

       }

       /* read a block */

@@ -95,7 +95,7 @@ static const unsigned short bit_mask[17] = {

 static int zipd_read_input(struct mszipd_stream *zip) {

   int read = zip->sys->read(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);

-  if (read < 0) return zip->error = MSPACK_ERR_READ;

+  if (read <= 0) return zip->error = MSPACK_ERR_READ;

   zip->i_ptr = &zip->inbuf[0];

   zip->i_end = &zip->inbuf[read];

@@ -15,7 +15,7 @@

 # define D(x) do { printf("%s:%d (%s) ",__FILE__, __LINE__, __FUNCTION__); \

                    printf x ; fputc('\n', stdout); fflush(stdout);} while (0);

 #else

-# define D(x)

+# define D(x) cli_dbgmsg x ;

 #endif

 /* endian-neutral reading of little-endian data */