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

Stephen Gran steve at lobefin.net
Thu Sep 4 12:37:03 UTC 2008


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

    Revert "fix big-endian support"
    
    This reverts commit dee8d6bae5479838c5615c17ea63cfd339c4c0f8.

diff --git a/ChangeLog b/ChangeLog
index fab5956..156596e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Mon Apr  7 22:38:27 CEST 2008 (tk)
-----------------------------------
-  * libclamav/msexpand.c: fix big-endian support
-
 Mon Apr  7 11:15:49 CEST 2008 (tk)
 ----------------------------------
   * libclamav/chmunpack.c,cab.c: downgrade some error messages (bb#911, bb#798)
diff --git a/libclamav/msexpand.c b/libclamav/msexpand.c
index fc6e74c..d9ed02c 100644
--- a/libclamav/msexpand.c
+++ b/libclamav/msexpand.c
@@ -84,7 +84,7 @@ struct msexp_hdr {
     if(ret == -1 || (unsigned int) ret != w)	\
 	return CL_EIO;				\
     wbytes += w;				\
-    if(wbytes >= EC32(hdr.fsize))		\
+    if(wbytes >= hdr.fsize)			\
 	return CL_SUCCESS;			\
     w = 0;
 
@@ -106,9 +106,9 @@ int cli_msexpand(int fd, int ofd, cli_ctx *ctx)
 	return CL_EFORMAT;
     }
 
-    cli_dbgmsg("MSEXPAND: File size from header: %u\n", EC32(hdr.fsize));
+    cli_dbgmsg("MSEXPAND: File size from header: %u\n", hdr.fsize);
 
-    if(cli_checklimits("MSEXPAND", ctx, EC32(hdr.fsize), 0, 0)!=CL_CLEAN)
+    if(cli_checklimits("MSEXPAND", ctx, hdr.fsize, 0, 0)!=CL_CLEAN)
         return CL_SUCCESS;
 
     while(1) {

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list