[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-security, updated. debian/0.90.1dfsg-4etch16-5-g0f3ca52

[Michael Tautschnig]

The following commit has been merged in the debian/etch-security branch:
commit 0f3ca521bd39dcdf1eb23e0f1bde5c9348b45664
Author: Michael Tautschnig <mt at debian.org>
Date:   Fri Apr 10 15:50:40 2009 +0200

    Revert direct changes in original files
    
    - This partly reverts commits ed2256a91bd93eab278e8f834c4ad47525939b21 and
      3b2786307112ba9193a3d3f0c8df1ca73baf1ce1
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/libclamav/pe.c b/libclamav/pe.c
index 18d5c71..b61cab2 100644
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@@ -679,7 +679,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 
 	cli_dbgmsg("------------------------------------\n");
 
-	if (DETECT_BROKEN && (!valign || EC32(section_hdr[i].VirtualAddress)%valign)) { /* Bad virtual alignment */
+	if (DETECT_BROKEN && EC32(section_hdr[i].VirtualAddress)%valign) { /* Bad virtual alignment */
 	    cli_dbgmsg("VirtualAddress is misaligned\n");
 	    if(ctx->virname)
 	        *ctx->virname = "Broken.Executable";
diff --git a/libclamav/untar.c b/libclamav/untar.c
index a4225b8..6d0257c 100644
--- a/libclamav/untar.c
+++ b/libclamav/untar.c
@@ -182,10 +182,6 @@ cli_untar(const char *dir, int desc, unsigned int posix, const struct cl_limits
 			if(skipEntry) {
 				const int nskip = (size % BLOCKSIZE || !size) ? size + BLOCKSIZE - (size % BLOCKSIZE) : size;
 
-        if(nskip < 0) {
-          cli_dbgmsg("cli_untar: got nagative skip size, giving up\n");
-          return CL_CLEAN;
-        }
 				cli_dbgmsg("cli_untar: skipping entry\n");
 				lseek(desc, nskip, SEEK_CUR);
 				continue;

-- 
Debian repository for ClamAV