From patchwork Wed Nov 9 23:07:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17364 Received: (qmail 18560 invoked by alias); 9 Nov 2016 23:07:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 18445 invoked by uid 89); 9 Nov 2016 23:07:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:U*tom X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Wed, 09 Nov 2016 23:07:45 +0000 Received: (qmail 3735 invoked by uid 0); 9 Nov 2016 23:07:44 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy10.mail.unifiedlayer.com with SMTP; 9 Nov 2016 23:07:44 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 5z7B1u00d2f2jeq01z7EbF; Wed, 09 Nov 2016 16:07:14 -0700 X-Authority-Analysis: v=2.1 cv=WL/sABcR c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=zstS-IiYAAAA:8 a=20KFwNOVAAAA:8 a=BM6picoBNCgbQRsDjgIA:9 a=4G6NA9xxw8l3yy4pmD5M:22 a=e_O65bzb51kRm2y5VmPK:22 Received: from 97-118-168-190.hlrn.qwest.net ([97.118.168.190]:42762 helo=bapiya.localdomain) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c4bxX-0005uE-AD; Wed, 09 Nov 2016 16:07:11 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [FYI 1/2] Use std::string in rust_get_disr_info Date: Wed, 9 Nov 2016 16:07:07 -0700 Message-Id: <1478732828-14454-2-git-send-email-tom@tromey.com> In-Reply-To: <1478732828-14454-1-git-send-email-tom@tromey.com> References: <1478732828-14454-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c4bxX-0005uE-AD X-Source-Sender: 97-118-168-190.hlrn.qwest.net (bapiya.localdomain) [97.118.168.190]:42762 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes rust_get_disr_info to use std::string in one more spot, avoiding a memory leak. 2016-11-09 Tom Tromey * rust-lang.c (rust_get_disr_info): Use std::string in one more spot. --- gdb/ChangeLog | 5 +++++ gdb/rust-lang.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9123596..66a711a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-11-09 Tom Tromey + + * rust-lang.c (rust_get_disr_info): Use std::string in one more + spot. + 2016-11-09 Pedro Alves * ax-gdb.c (agent_eval_command_one): Use std::move instead of diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 295dae1..7d4bfc3 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -222,7 +222,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr, with the first field being the actual type works. */ const char *field_name = TYPE_NAME (TYPE_FIELD_TYPE (type, 0)); const char *last = rust_last_path_segment (field_name); - ret.name = concat (TYPE_NAME (type), "::", last, (char *) NULL); + ret.name = std::string (TYPE_NAME (type)) + "::" + last; ret.field_no = RUST_ENCODED_ENUM_REAL; ret.is_encoded = 1; return ret;