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

+Wed Mar 31 18:13:38 CEST 2010 (tk)

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

+ * libclamav/mspack.c: improve unpacking of malformed cabinets (bb#1826)

+

 Wed Mar 31 18:07:05 CEST 2010 (acab)

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

   * libclamav/7z: add recovery mode to 7z ansi

@@ -697,10 +697,9 @@ int mszip_decompress(struct mszip_stream *zip, off_t out_bytes) {

     out_bytes   -= i;

   }

-  if (out_bytes) {

+  if (out_bytes)

     cli_dbgmsg("mszip_decompress: bytes left to output\n");

-    return zip->error = CL_EFORMAT;

-  }

+

   return CL_SUCCESS;

 }

@@ -1508,10 +1507,8 @@ int lzx_decompress(struct lzx_stream *lzx, off_t out_bytes) {

   } /* while (lzx->frame < end_frame) */

-  if (out_bytes) {

+  if (out_bytes)

     cli_dbgmsg("lzx_decompress: bytes left to output\n");

-    return lzx->error = CL_EFORMAT;

-  }

   /* store local state */

   LZX_STORE_BITS;