From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id SFCuGHXw8GRq5Q4AWB0awg (envelope-from ) for ; Thu, 31 Aug 2023 15:56:37 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=fpGhyKi5; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 62B3D1E0C2; Thu, 31 Aug 2023 15:56:37 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 550881E098 for ; Thu, 31 Aug 2023 15:56:35 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D76BF3858439 for ; Thu, 31 Aug 2023 19:56:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D76BF3858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693511794; bh=VUBcfuU7O+Sco3sI4wX2caTzfYZwsrwdnioMAKUenkA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fpGhyKi5jSpKjMxAoqvfqfYuvH/QupKgcG0yAnRzenG8wX8llQm7X3pbsVDwN4uGs doujKMu/L3FFPP0S79WskSEpazXJJHJz/gjDEoebBTproOjjDkyiV5DuzXDPeLYbGf ikevYldfvSBUJrHzo2Ma4hWS4oCi/PDr3aZNokIo= Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 39A023858D20 for ; Thu, 31 Aug 2023 19:56:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 39A023858D20 Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 966B61E092; Thu, 31 Aug 2023 15:56:12 -0400 (EDT) To: gdb-patches@sourceware.org Subject: [PATCH] gdb: remove uses of alloca in gdbtypes.c Date: Thu, 31 Aug 2023 15:56:10 -0400 Message-ID: <20230831195611.1286355-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3497.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" From: Simon Marchi Replace two uses of alloca with std::string. Change-Id: I970ae3f450da407494d95668a57bba8796d6292b --- gdb/gdbtypes.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) 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) { base-commit: 911e1e795e2496e1a5315601ab89e56afcd10fb0 -- 2.42.0