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

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 3d478af12a9b71a21e329c3f90b8043e37cca774
Author: aCaB <acab at clamav.net>
Date:   Fri Jul 31 12:52:41 2009 +0200

    fix check for pe32+

diff --git a/ChangeLog b/ChangeLog
index a8a36a4..1ed40ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 31 12:52:08 CEST 2009 (acab)
+------------------------------------
+ * libclamav/pe.c: fix check for pe32+
+
 Tue Jul 28 20:34:13 CEST 2009 (tk)
 ----------------------------------
  * clamscan, clamd, libclamav: load cvd files on-the-fly (without unpacking them
diff --git a/libclamav/pe.c b/libclamav/pe.c
index 6e20878..1ce963b 100644
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@@ -645,7 +645,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)
     }
 
     /* This will be a chicken and egg problem until we drop 9x */
-    if(EC32(optional_hdr64.Magic)==PE32P_SIGNATURE) {
+    if(EC16(optional_hdr64.Magic)==PE32P_SIGNATURE) {
         if(EC16(file_hdr.SizeOfOptionalHeader)!=sizeof(struct pe_image_optional_hdr64)) {
 	    /* FIXME: need to play around a bit more with xp64 */
 	    cli_dbgmsg("Incorrect SizeOfOptionalHeader for PE32+\n");
@@ -2341,7 +2341,7 @@ int cli_peheader(int desc, struct cli_exe_info *peinfo)
 	return -1;
     }
 
-    if(EC32(optional_hdr64.Magic)==PE32P_SIGNATURE) { /* PE+ */
+    if(EC16(optional_hdr64.Magic)==PE32P_SIGNATURE) { /* PE+ */
         if(EC16(file_hdr.SizeOfOptionalHeader)!=sizeof(struct pe_image_optional_hdr64)) {
 	    cli_dbgmsg("Incorrect SizeOfOptionalHeader for PE32+\n");
 	    return -1;

-- 
Debian repository for ClamAV