diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/linux-tdep.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4f12edc..af82b23 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2020-06-15 Tom Tromey <tromey@adacore.com> + * linux-tdep.c (dump_mapping_p): Use target_read_memory. + +2020-06-15 Tom Tromey <tromey@adacore.com> + * valprint.c (read_string): Update comment. * target.c (MIN): Remove. (target_read_string): Rewrite. diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 0f95593..2dcdc63 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -701,22 +701,16 @@ dump_mapping_p (filter_flags filterflags, const struct smaps_vmflags *v, if (!dump_p && private_p && offset == 0 && (filterflags & COREFILTER_ELF_HEADERS) != 0) { - /* Let's check if we have an ELF header. */ - gdb::unique_xmalloc_ptr<char> header; - int errcode; - /* Useful define specifying the size of the ELF magical header. */ #ifndef SELFMAG #define SELFMAG 4 #endif - /* Read the first SELFMAG bytes and check if it is ELFMAG. */ - if (target_read_string (addr, &header, SELFMAG, &errcode) == SELFMAG - && errcode == 0) + /* Let's check if we have an ELF header. */ + gdb_byte h[SELFMAG]; + if (target_read_memory (addr, h, SELFMAG) == 0) { - const char *h = header.get (); - /* The EI_MAG* and ELFMAG* constants come from <elf/common.h>. */ if (h[EI_MAG0] == ELFMAG0 && h[EI_MAG1] == ELFMAG1 |