diff mbox series

gdb: remove uses of alloca in gdbtypes.c

Message ID 20230831195611.1286355-1-simon.marchi@efficios.com
State New
Headers
Series gdb: remove uses of alloca in gdbtypes.c |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm warning Patch is already merged

Commit Message

Simon Marchi Aug. 31, 2023, 7:56 p.m. UTC 
  From: Simon Marchi <simon.marchi@polymtl.ca>

Replace two uses of alloca with std::string.

Change-Id: I970ae3f450da407494d95668a57bba8796d6292b
---
 gdb/gdbtypes.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)


base-commit: 911e1e795e2496e1a5315601ab89e56afcd10fb0

Comments

Kevin Buettner Aug. 31, 2023, 10:09 p.m. UTC | #1 
On Thu, 31 Aug 2023 15:56:10 -0400
Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> wrote:

> Replace two uses of alloca with std::string.

LGTM.

Approved-by: Kevin Buettner <kevinb@redhat.com>
Simon Marchi Sept. 1, 2023, 1:29 a.m. UTC | #2 
On 8/31/23 18:09, Kevin Buettner via Gdb-patches wrote:
> On Thu, 31 Aug 2023 15:56:10 -0400
> Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> wrote:
> 
>> Replace two uses of alloca with std::string.
> 
> LGTM.
> 
> Approved-by: Kevin Buettner <kevinb@redhat.com>
> 

Thanks, pushed.

Simon
diff mbox series

Patch

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 59ddd75ab798..5e15ec64c41c 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1670,11 +1670,12 @@  struct type *
 lookup_unsigned_typename (const struct language_defn *language,
 			  const char *name)
 {
-  char *uns = (char *) alloca (strlen (name) + 10);
+  std::string uns;
+  uns.reserve (strlen (name) + strlen ("unsigned "));
+  uns = "unsigned ";
+  uns += name;
 
-  strcpy (uns, "unsigned ");
-  strcpy (uns + 9, name);
-  return lookup_typename (language, uns, NULL, 0);
+  return lookup_typename (language, uns.c_str (), NULL, 0);
 }
 
 struct type *
@@ -1760,16 +1761,14 @@  struct type *
 lookup_template_type (const char *name, struct type *type, 
 		      const struct block *block)
 {
-  struct symbol *sym;
-  char *nam = (char *) 
-    alloca (strlen (name) + strlen (type->name ()) + 4);
-
-  strcpy (nam, name);
-  strcat (nam, "<");
-  strcat (nam, type->name ());
-  strcat (nam, " >");	/* FIXME, extra space still introduced in gcc?  */
+  std::string nam;
+  nam.reserve (strlen (name) + strlen (type->name ()) + strlen ("< >"));
+  nam = name;
+  nam += "<";
+  nam += type->name ();
+  nam += " >"; /* FIXME, extra space still introduced in gcc?  */
 
-  sym = lookup_symbol (nam, block, VAR_DOMAIN, 0).symbol;
+  symbol *sym = lookup_symbol (nam.c_str (), block, VAR_DOMAIN, 0).symbol;
 
   if (sym == NULL)
     {