Fix the USE_ARRAY for 64 bit code. From Mike Frysinger.

diff --git a/src/readelf.c b/src/readelf.c
index bc2949ec63334db3e4f97c8de2e20e986736b063..878a7636b3a9854fd4377ebae33d8ef39524a8a8 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -37,7 +37,7 @@
 #include "readelf.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$Id: readelf.c,v 1.53 2005/10/31 13:53:40 christos Exp $")
+FILE_RCSID("@(#)$Id: readelf.c,v 1.54 2006/01/13 00:45:21 christos Exp $")
 #endif
 
 #ifdef ELFCORE
@@ -121,6 +121,14 @@ getu64(int swap, uint64_t value)
                return value;
 }
 
+#ifdef USE_ARRAY_FOR_64BIT_TYPES
+# define elf_getu64(swap, array) \
+       ((swap ? ((uint64_t)getu32(swap, array[0])) << 32 : getu32(swap, array[0])) + \
+        (swap ? getu32(swap, array[1]) : ((uint64_t)getu32(swap, array[1]) << 32)))
+#else
+# define elf_getu64(swap, value) getu64(swap, value)
+#endif
+
 #define xsh_addr       (class == ELFCLASS32            \
                         ? (void *) &sh32               \
                         : (void *) &sh64)
@@ -912,11 +920,7 @@ file_tryelf(struct magic_set *ms, int fd, const unsigned char *buf,
                if (getu16(swap, elfhdr.e_type) == ET_CORE) {
 #ifdef ELFCORE
                        if (dophn_core(ms, class, swap, fd,
-#ifdef USE_ARRAY_FOR_64BIT_TYPES
-                           (off_t)getu32(swap, elfhdr.e_phoff[1]),
-#else
-                           (off_t)getu64(swap, elfhdr.e_phoff),
-#endif
+                           (off_t)elf_getu64(swap, elfhdr.e_phoff),
                            getu16(swap, elfhdr.e_phnum), 
                            (size_t)getu16(swap, elfhdr.e_phentsize)) == -1)
                                return -1;
@@ -926,22 +930,14 @@ file_tryelf(struct magic_set *ms, int fd, const unsigned char *buf,
                } else {
                        if (getu16(swap, elfhdr.e_type) == ET_EXEC) {
                                if (dophn_exec(ms, class, swap, fd,
-#ifdef USE_ARRAY_FOR_64BIT_TYPES
-                                   (off_t)getu32(swap, elfhdr.e_phoff[1]),
-#else
-                                   (off_t)getu64(swap, elfhdr.e_phoff),
-#endif
+                                   (off_t)elf_getu64(swap, elfhdr.e_phoff),
                                    getu16(swap, elfhdr.e_phnum), 
                                    (size_t)getu16(swap, elfhdr.e_phentsize))
                                    == -1)
                                        return -1;
                        }
                        if (doshn(ms, class, swap, fd,
-#ifdef USE_ARRAY_FOR_64BIT_TYPES
-                           (off_t)getu32(swap, elfhdr.e_shoff[1]),
-#else
-                           (off_t)getu64(swap, elfhdr.e_shoff),
-#endif
+                           (off_t)elf_getu64(swap, elfhdr.e_shoff),
                            getu16(swap, elfhdr.e_shnum),
                            (size_t)getu16(swap, elfhdr.e_shentsize)) == -1)
                                return -1;

diff --git a/src/readelf.h b/src/readelf.h
index fb25dccb3f4f8e622a241aca2bc8635184b6c290..20a4d0fc014617717fae5ae36a52e6d8b7038729 100644 (file)
--- a/src/readelf.h
+++ b/src/readelf.h
@@ -50,6 +50,7 @@ typedef       uint32_t        Elf64_Addr[2];
 typedef        uint32_t        Elf64_Off[2];
 typedef uint32_t       Elf64_Xword[2];
 #else
+#undef USE_ARRAY_FOR_64BIT_TYPES
 typedef        uint64_t        Elf64_Addr;
 typedef        uint64_t        Elf64_Off;
 typedef uint64_t       Elf64_Xword;