From ec66d6ea54679d00c1f0d52a5a9fa0cbb8b86d47 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 6 May 2021 13:16:26 -0400 Subject: gdb: make inferior::args a unique_xmalloc_ptr Use unique_xmalloc_ptr to avoid manual memory management. gdb/ChangeLog: * inferior.h (class inferior) : Change type to unique_xmalloc_ptr. * inferior.c (inferior::~inferior): Don't free args. * infcmd.c (get_inferior_args): Adjust. (set_inferior_args): Adjust. Change-Id: I96300e59eb2faf2d80660416a8f5694d243a944e --- gdb/infcmd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gdb/infcmd.c') diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 5aa6b00..5d9d792 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -136,9 +136,9 @@ get_inferior_args (void) } if (current_inferior ()->args == NULL) - current_inferior ()->args = xstrdup (""); + current_inferior ()->args = make_unique_xstrdup (""); - return current_inferior ()->args; + return current_inferior ()->args.get (); } /* Set the arguments for the current inferior. Ownership of @@ -147,8 +147,11 @@ get_inferior_args (void) void set_inferior_args (const char *newargs) { - xfree (current_inferior ()->args); - current_inferior ()->args = newargs ? xstrdup (newargs) : NULL; + if (newargs != nullptr) + current_inferior ()->args = make_unique_xstrdup (newargs); + else + current_inferior ()->args.reset (); + current_inferior ()->argc = 0; current_inferior ()->argv = 0; } -- cgit v1.1