[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 158c35e81a25ea5fda55a2a7f62ea9fec2e883d9
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Mar 31 18:15:44 2010 +0200

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

diff --git a/ChangeLog b/ChangeLog
index 47f48e1..e373923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/libclamav/mspack.c b/libclamav/mspack.c
index 96b4bdc..5381f63 100644
--- a/libclamav/mspack.c
+++ b/libclamav/mspack.c
@@ -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;

-- 
Debian repository for ClamAV