gdb: remove xfree in xml-support.c

Replace an xfree with automatic memory management with a unique pointer.

gdb/ChangeLog:

	* xml-support.c (xml_fetch_content_from_file): Replace xfree
	with gdb::unique_xmalloc_ptr<char>.

Change-Id: Ia4d735b383e3b9eb660f445f2c7f2c5e27411b64

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8451cadcd5b04ba034514c5deca66bc619175e7e..cbb08c3e9a9b2edd96671c7ed0bbf86c2207c1a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-14  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * xml-support.c (xml_fetch_content_from_file): Replace xfree
+       with gdb::unique_xmalloc_ptr<char>.
+
 2020-09-14  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * xml-support.h (xml_fetch_another): Change type to be a

diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 8b698e511f12c572f79528c909b01545ef21ab34..5568c8a74ec459edd47e8936a8aff852076e5ef1 100644 (file)
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -969,10 +969,10 @@ xml_fetch_content_from_file (const char *filename, const char *dirname)
 
   if (dirname != nullptr && *dirname != '\0')
     {
-      char *fullname = concat (dirname, "/", filename, (char *) NULL);
+      gdb::unique_xmalloc_ptr<char> fullname
+       (concat (dirname, "/", filename, (char *) NULL));
 
-      file = gdb_fopen_cloexec (fullname, FOPEN_RB);
-      xfree (fullname);
+      file = gdb_fopen_cloexec (fullname.get (), FOPEN_RB);
     }
   else
     file = gdb_fopen_cloexec (filename, FOPEN_RB);