diff options
| author | Ian Lance Taylor <iant@golang.org> | 2018-01-25 15:33:36 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-25 15:33:36 +0000 |
| commit | 45f3ab193dfa5c49ab7b61a7ade2eb5e476641d0 (patch) | |
| tree | 4a5c6cbe381ac4d74198d729d8b8d8f58b9e746b | |
| parent | 3d8fb311338b191231790252e91889984995055c (diff) | |
| download | gcc-45f3ab193dfa5c49ab7b61a7ade2eb5e476641d0.zip gcc-45f3ab193dfa5c49ab7b61a7ade2eb5e476641d0.tar.gz gcc-45f3ab193dfa5c49ab7b61a7ade2eb5e476641d0.tar.bz2 | |
* pecoff.c (coff_add): Another memcpy -> coff_read4 fix.
From-SVN: r257052
| -rw-r--r-- | libbacktrace/ChangeLog | 4 | ||||
| -rw-r--r-- | libbacktrace/pecoff.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index a035ec3..ddad6f0 100644 --- 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 48bc7ac..0158877 100644 --- 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; } |