Patchwork [RFA,2/2] Use gdb::unique_xmalloc_ptr in auto_load_section_scripts

login
register
mail settings
Submitter Tom Tromey
Date Feb. 9, 2018, 12:55 p.m.
Message ID <20180209125553.7392-3-tom@tromey.com>
Download mbox | patch
Permalink /patch/25884/
State New
Headers show

Comments

Tom Tromey - Feb. 9, 2018, 12:55 p.m.
This changes auto_load_section_scripts to use gdb::unique_xmalloc_ptr,
allowing the removal of a cleanup.

2018-02-09  Tom Tromey  <tom@tromey.com>

	* auto-load.c (auto_load_section_scripts): Use
	gdb::unique_xmalloc_ptr.
---
 gdb/ChangeLog   | 5 +++++
 gdb/auto-load.c | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index adc3d19d3b..9e03aa2908 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@ 
 2018-02-09  Tom Tromey  <tom@tromey.com>
 
+	* auto-load.c (auto_load_section_scripts): Use
+	gdb::unique_xmalloc_ptr.
+
+2018-02-09  Tom Tromey  <tom@tromey.com>
+
 	* auto-load.c (execute_script_contents): Use std::string.
 
 2018-02-09  Joel Brobecker  <brobecker@adacore.com>
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 1f3d366a56..b79341faf6 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -1153,13 +1153,11 @@  auto_load_section_scripts (struct objfile *objfile, const char *section_name)
 	     section_name, bfd_get_filename (abfd));
   else
     {
-      struct cleanup *cleanups;
-      char *p = (char *) data;
+      gdb::unique_xmalloc_ptr<bfd_byte> data_holder (data);
 
-      cleanups = make_cleanup (xfree, p);
+      char *p = (char *) data;
       source_section_scripts (objfile, section_name, p,
 			      p + bfd_get_section_size (scripts_sect));
-      do_cleanups (cleanups);
     }
 }