elf_getarsym: Use memcpy instead of pointer dereference so as not to assume the field...

Signed-off-by: Roland McGrath <roland@hack.frob.com>

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 4a9e358..23e1a86 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07  Roland McGrath  <roland@hack.frob.com>
+
+       * elf_getarsym.c (read_number_entries): Use memcpy instead of pointer
+       dereference so as not to assume the field is naturally aligned.
+
 2012-09-17  Petr Machata  <pmachata@redhat.com>
 
        * elf.h: Update from glibc.

diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c
index 9e0f4c2..ffdd8ad 100644 (file)
--- a/libelf/elf_getarsym.c
+++ b/libelf/elf_getarsym.c
@@ -57,7 +57,9 @@ read_number_entries (uint64_t *nump, Elf *elf, size_t *offp, bool index64_p)
 
   size_t w = index64_p ? 8 : 4;
   if (elf->map_address != NULL)
-    u = *(union u *) (elf->map_address + *offp);
+    /* Use memcpy instead of pointer dereference so as not to assume the
+       field is naturally aligned within the file.  */
+    memcpy (&u, elf->map_address + *offp, sizeof u);
   else if ((size_t) pread_retry (elf->fildes, &u, w, *offp) != w)
     return -1;