* pecoff.c (coff_add): Another memcpy -> coff_read4 fix.

From-SVN: r257052

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index a035ec36937402c648ec723ee9f20993b41694c3..ddad6f0ec2f29659e612189279daa1a73fdc88f1 100644 (file)
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-25  Ian Lance Taylor  <iant@golang.org>
+
+       * pecoff.c (coff_add): Another memcpy -> coff_read4 fix.
+
 2018-01-24  Ian Lance Taylor  <iant@golang.org>
 
        * pecoff.c (coff_add): Use coff_read4, not memcpy.

diff --git a/libbacktrace/pecoff.c b/libbacktrace/pecoff.c
index 48bc7ac4492402a87d297b4bd3699fa2a4c3a0b4..015887731a06982cc1c5d3d7903c7e20a64dc731 100644 (file)
--- a/libbacktrace/pecoff.c
+++ b/libbacktrace/pecoff.c
@@ -631,10 +631,10 @@ coff_add (struct backtrace_state *state, int descriptor,
     goto fail;
 
   {
-    const char *vptr = (const char *)fhdr_view.data;
+    const unsigned char *vptr = fhdr_view.data;
 
     if (vptr[0] == 'M' && vptr[1] == 'Z')
-      memcpy (&fhdr_off, vptr + 0x3c, 4);
+      fhdr_off = coff_read4 (vptr + 0x3c);
     else
       fhdr_off = 0;
   }