[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 224fee54dd6cd8933d7007331ec2bfca0398d4b4
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Mar 31 18:21:19 2010 +0200

    libclamav/mspack.c: fix Quantum decompressor (bb#1771)

diff --git a/ChangeLog b/ChangeLog
index e373923..8f3ca3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 31 18:19:23 CEST 2010 (tk)
+----------------------------------
+ * libclamav/mspack.c: fix Quantum decompressor (bb#1771)
+
 Wed Mar 31 18:13:38 CEST 2010 (tk)
 ----------------------------------
  * libclamav/mspack.c: improve unpacking of malformed cabinets (bb#1826)
diff --git a/libclamav/mspack.c b/libclamav/mspack.c
index 5381f63..6af8648 100644
--- a/libclamav/mspack.c
+++ b/libclamav/mspack.c
@@ -1896,6 +1896,11 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {
 	  return qtm->error = CL_EFORMAT;
 	}
 
+	if (window_posn + match_length > qtm->window_size) {
+	  cli_dbgmsg("qtm_decompress: match ran over window wrap\n");
+	  return qtm->error = CL_EFORMAT;
+	}
+
 	rundest = &window[window_posn];
 	i = match_length;
 	/* does match offset wrap the window? */

-- 
Debian repository for ClamAV