fix check for pe32+

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

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;