[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 81c235f96ce45113229fae08cc790422ef0a8a12
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:44 2008 +0100

    Revert "add work-around for zlib issues with mixed data (bb#932)"
    
    This reverts commit 1978540fe2d8757f31ec9dcb5f0b1f79b395d422.

diff --git a/ChangeLog b/ChangeLog
index 77eaa55..190b759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Mon Apr 21 16:21:56 CEST 2008 (tk)
-----------------------------------
-  * libclamav/cvd.c: add work-around for zlib issues with mixed data (bb#932)
-
 Mon Apr 21 11:28:38 CEST 2008 (tk)
 ----------------------------------
   * libclamav/others.h: explicitely cast some constants (bb#936)
diff --git a/libclamav/cvd.c b/libclamav/cvd.c
index a900347..c741bb4 100644
--- a/libclamav/cvd.c
+++ b/libclamav/cvd.c
@@ -183,34 +183,24 @@ static int cli_tgzload(int fd, struct cl_engine **engine, unsigned int *signo, u
 	char osize[13], name[101];
 	char block[TAR_BLOCKSIZE];
 	int nread, fdd, ret;
-	unsigned int type, size, pad, compr = 1;
+	unsigned int type, size, pad;
 	gzFile *infile;
 	z_off_t off;
 
 
     cli_dbgmsg("in cli_tgzload()\n");
 
-    lseek(fd, 512, SEEK_SET);
-    if(cli_readn(fd, block, 7) != 7)
-	return CL_EFORMAT; /* truncated file? */
-
-    if(!strncmp(block, "COPYING", 7))
-	compr = 0;
-
     if((fdd = dup(fd)) == -1) {
 	cli_errmsg("cli_tgzload: Can't duplicate descriptor %d\n", fd);
 	return CL_EIO;
     }
 
-    lseek(fdd, 512, SEEK_SET);
-
     if((infile = gzdopen(fdd, "rb")) == NULL) {
 	cli_errmsg("cli_tgzload: Can't gzdopen() descriptor %d, errno = %d\n", fdd, errno);
 	return CL_EIO;
     }
 
-    if(!compr)
-	gzseek(infile, 512, SEEK_SET);
+    gzseek(infile, 512, SEEK_SET);
 
     while(1) {
 

-- 
Debian repository for ClamAV