From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 107928 invoked by alias); 5 Mar 2020 23:07:45 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 107919 invoked by uid 89); 5 Mar 2020 23:07:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.7 required=5.0 tests=AWL,BAYES_00,FORGED_SPF_HELO,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KHOP_HELO_FCRDNS,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1397, HContent-Transfer-Encoding:8bit X-HELO: mail.baldwin.cx Received: from bigwig.baldwin.cx (HELO mail.baldwin.cx) (96.47.65.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 05 Mar 2020 23:07:43 +0000 Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 0F76610B7E3 for ; Thu, 5 Mar 2020 18:07:40 -0500 (EST) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH] Use std::string for 'psargs'. Date: Thu, 05 Mar 2020 23:07:00 -0000 Message-Id: <20200305230658.89374-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2020-03/txt/msg00135.txt fbsd_make_corefile_notes leaked the memory for psargs previously. gdb/ChangeLog: * fbsd-tdep.c (fbsd_make_corefile_notes): Use std::string for psargs. --- gdb/ChangeLog | 5 +++++ gdb/fbsd-tdep.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d8c44d80e4..ee0d10d8c9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-03-05 John Baldwin + + * fbsd-tdep.c (fbsd_make_corefile_notes): Use std::string for + psargs. + 2020-03-05 Tankut Baris Aktemur * .gitattributes: New file. diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c index bc1b5afd02..ffffb18700 100644 --- a/gdb/fbsd-tdep.c +++ b/gdb/fbsd-tdep.c @@ -725,14 +725,14 @@ fbsd_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size) if (get_exec_file (0)) { const char *fname = lbasename (get_exec_file (0)); - char *psargs = xstrdup (fname); + std::string psargs = fname; - if (get_inferior_args ()) - psargs = reconcat (psargs, psargs, " ", get_inferior_args (), - (char *) NULL); + const char *infargs = get_inferior_args (); + if (infargs != NULL) + psargs = psargs + " " + infargs; note_data = elfcore_write_prpsinfo (obfd, note_data, note_size, - fname, psargs); + fname, psargs.c_str ()); } /* Thread register information. */ -- 2.23.0