fix bug in recognizing 64 bit files

dlang · Nov 27, 2011 · 1b1b37e · 1b1b37e
1 parent ce29a8a
commit 1b1b37e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/rt/image.d b/src/rt/image.d
@@ -94,12 +94,12 @@ struct CPU
 
         bool is32bit ()
         {
-                return (header.magic & MH_MAGIC) != 0;
+                return (header.magic == MH_MAGIC);
         }
 
         bool is64bit ()
         {
-                return (header.magic & MH_MAGIC_64) != 0;
+                return (header.magic == MH_MAGIC_64);
         }
 }
 

diff --git a/src/rt/memory_osx.d b/src/rt/memory_osx.d
@@ -40,7 +40,7 @@ enum SegRef[5] dataSegs = [{SEG_DATA, SECT_DATA},
 ubyte[] getSection(in mach_header* header, intptr_t slide,
                    in char* segmentName, in char* sectionName)
 {
-    if ((header.magic & MH_MAGIC) != 0)
+    if (header.magic == MH_MAGIC)
     {
         auto sect = getsectbynamefromheader(header,
                                             segmentName,
@@ -55,7 +55,7 @@ ubyte[] getSection(in mach_header* header, intptr_t slide,
         return null;
 
     }
-    else if ((header.magic & MH_MAGIC_64) != 0)
+    else if (header.magic == MH_MAGIC_64)
     {
         auto header64 = cast(mach_header_64*) header;
         auto sect     = getsectbynamefromheader_64(header64,
@@ -70,7 +70,8 @@ ubyte[] getSection(in mach_header* header, intptr_t slide,
         }
         return null;
     }
-    return null;
+    else
+	return null;
 }