diff options
| author | Markus Metzger <markus.t.metzger@intel.com> | 2014-05-22 08:47:42 +0200 |
|---|---|---|
| committer | Markus Metzger <markus.t.metzger@intel.com> | 2014-06-25 09:54:31 +0200 |
| commit | 1d1f1ccb331f1fe9825c3bb6f6231a3aeb560d6f (patch) | |
| tree | 873d0ea4e5a1045e06bbbce37ef9e3f8ce54c0f3 | |
| parent | 31f0c4c1c653b59ce8552402ecc1b3249273f2de (diff) | |
| download | gdb-1d1f1ccb331f1fe9825c3bb6f6231a3aeb560d6f.zip gdb-1d1f1ccb331f1fe9825c3bb6f6231a3aeb560d6f.tar.gz gdb-1d1f1ccb331f1fe9825c3bb6f6231a3aeb560d6f.tar.bz2 | |
make_corefile_notes: have caller free returned memory
The various make_corefile_notes implementations for gdbarch as well as target
currently make an xfree cleanup on the data they return. This causes problems
when trying to put a TRY_CATCH around the make_corefile_notes call.
Specifically, we get a stale cleanup error in restore_my_cleanups.
Omit the make_cleanup and have the caller free the memory.
gdb/
* fbsd-nat.c (fbsd_make_corefile_notes): Remove make_cleanup call.
* gcore.c (write_gcore_file): Free memory returned from
make_corefile_notes.
* linux-tdep.c (linux_make_corefile_notes): Remove make_cleanup call.
* procfs.c (procfs_make_note_section): Remove make_cleanup call.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/fbsd-nat.c | 1 | ||||
| -rw-r--r-- | gdb/gcore.c | 5 | ||||
| -rw-r--r-- | gdb/linux-tdep.c | 1 | ||||
| -rw-r--r-- | gdb/procfs.c | 1 |
5 files changed, 13 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44e8575..a56ec40 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-06-25 Markus Metzger <markus.t.metzger@intel.com> + + * fbsd-nat.c (fbsd_make_corefile_notes): Remove make_cleanup call. + * gcore.c (write_gcore_file): Free memory returned from + make_corefile_notes. + * linux-tdep.c (linux_make_corefile_notes): Remove make_cleanup call. + * procfs.c (procfs_make_note_section): Remove make_cleanup call. + 2014-06-24 Yao Qi <yao@codesourcery.com> * arm-linux-tdep.c (arm_linux_skip_trampoline_code): New. diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index 9f30edf..4e115b2 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -214,6 +214,5 @@ fbsd_make_corefile_notes (struct target_ops *self, bfd *obfd, int *note_size) fname, psargs); } - make_cleanup (xfree, note_data); return note_data; } diff --git a/gdb/gcore.c b/gdb/gcore.c index e225080..5427962 100644 --- a/gdb/gcore.c +++ b/gdb/gcore.c @@ -68,6 +68,7 @@ create_gcore_bfd (const char *filename) void write_gcore_file (bfd *obfd) { + struct cleanup *cleanup; void *note_data = NULL; int note_size = 0; asection *note_sec = NULL; @@ -81,6 +82,8 @@ write_gcore_file (bfd *obfd) else note_data = gdbarch_make_corefile_notes (target_gdbarch (), obfd, ¬e_size); + cleanup = make_cleanup (xfree, note_data); + if (note_data == NULL || note_size == 0) error (_("Target does not support core file generation.")); @@ -104,6 +107,8 @@ write_gcore_file (bfd *obfd) /* Write out the contents of the note section. */ if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size)) warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ())); + + do_cleanups (cleanup); } static void diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index ca19cf4..d0f1106 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1502,7 +1502,6 @@ linux_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size, note_data = linux_make_mappings_corefile_notes (gdbarch, obfd, note_data, note_size); - make_cleanup (xfree, note_data); return note_data; } diff --git a/gdb/procfs.c b/gdb/procfs.c index cbb44ce..4caaf7b 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -5522,7 +5522,6 @@ procfs_make_note_section (struct target_ops *self, bfd *obfd, int *note_size) xfree (auxv); } - make_cleanup (xfree, note_data); return note_data; } #else /* !Solaris */ |