From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WLIZCSdoBWcQRQYAWB0awg (envelope-from ) for ; Tue, 08 Oct 2024 13:13:11 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KebaZ/EA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1CAC31E355; Tue, 8 Oct 2024 13:13:11 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,URIBL_BLOCKED,URIBL_DBL_BLOCKED_OPENDNS autolearn=ham autolearn_force=no version=4.0.0 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 66A211E05C for ; Tue, 8 Oct 2024 13:13:10 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 09239385C6C7 for ; Tue, 8 Oct 2024 17:13:10 +0000 (GMT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 87F2F385C6CC for ; Tue, 8 Oct 2024 17:11:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 87F2F385C6CC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 87F2F385C6CC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728407520; cv=none; b=eSlix2S9dWBYjIkwuFTGOZpxk7LcuwpVZtvaVw3Xb2wFxV8Yk0Qs7D49PP5x19qTPngpaVDTilQd8n4Rqlnjbic9liVAIlejOw9UzpHZbrkBMmaRfXZU7EBnyQkTmHMbLJVY0K23Btj8qPOlqADevjR8lADHx+UX8pgHK6TRbJM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728407520; c=relaxed/simple; bh=K4pLoN9LawWLso3be2F4WfWLXg9ugM8SdqBEVgbTWcQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=QUsrf0pina9ZodpcPS/jDyB19dwZsSPpqQB8GB29rwHdqU9G8I/lml36+TUmi9dd2o+0xVQesKCYba6K3UgXmgGn6c0n1/OfpDUZ3TzcWlxFW8egutiFk3MIcMnK0Kp8zEN8b2cIQwVPYP9sK4iZ2PdB8WL2CkQ2hV57Nkcgk08= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728407518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z0D/UPRVAa9qiKwFp647bvU0AzoroKJtVSwwBV4mjRs=; b=KebaZ/EAGZMVqKCtvQ0TRYGmx5mXDIXtlWDEN0LXMIHrLfIOXCXMzlXQ6z8XnAdkaGx7G6 7Nbdffoc4h5cMYJmTioJp+glfMb9P5mzD2Q3plbNz2OXZ/bPWZUhyETJnP1DS8uXm1w8dG tR204tBvkA5EsN9B8203LqtLUpTuSKI= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-tB4IVd4bPqm8Dz7n5FUJQA-1; Tue, 08 Oct 2024 13:11:57 -0400 X-MC-Unique: tB4IVd4bPqm8Dz7n5FUJQA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a9946fff3adso185657566b.2 for ; Tue, 08 Oct 2024 10:11:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728407514; x=1729012314; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z0D/UPRVAa9qiKwFp647bvU0AzoroKJtVSwwBV4mjRs=; b=n7GpkL8slu1VZgCaRcyz4pD3L1huKjPW11ZOEhCe0NQ13jnjcCthSLy5+JFREQfSbB VFKLFOk45JYIef42GSiO8JXtWj14Kkf6fnx+hlPR7DK9B6gSx28mCgqmASRhKIKFPYy3 qQCSTFBcZVutefglInt0xHtSoPzDCTnxw3JXbUr1Kbxh9tTyvzBP5+sQvLcyuhlM4d+v PQEtb4FyUJsQjJalYNXBIZZ5auV0QU394yl9f0rVvEIAdFXjDR/jyyBvY2GLcMP3to9Y dfJdqBK48iY/332p8n1BEV6meUwcbbU3YVBvSEP9R3Nitu+/lctgE6d8s3ZSTwmx1yy/ B1Mg== X-Gm-Message-State: AOJu0Yyu+IGkD37BTN2FaZEjEMeoYIAH7BfOVPquyYSczkxTNeDteuAK l6H+ldtQ/YRwryzH5Dehea8UrwWLGRYqNGsAiWgBGs4hXGaQqmylm1OBDkIM/wF5gjm6RTUryGO Jmp1sPBgBhYATVr3S5xMXa77v5mB2HM/x/s/AY1Ux2Nzot8X94YwxhJpj2KkX8/TysFhjml7pdJ 21KRrH23XUZy8OAGKSpOCMuO7X21acL/lG2gHoQAJwhuM= X-Received: by 2002:a17:907:6d04:b0:a99:7b6f:c8a7 with SMTP id a640c23a62f3a-a997b6fca8emr233863066b.46.1728407513868; Tue, 08 Oct 2024 10:11:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGW/TJXKun+N0kfDhYEKD+YMpqYb0O+uLEATyBN3sQIpb80O7+lVoAc0T1vJ3m6+MHsEtas2Q== X-Received: by 2002:a17:907:6d04:b0:a99:7b6f:c8a7 with SMTP id a640c23a62f3a-a997b6fca8emr233860066b.46.1728407513382; Tue, 08 Oct 2024 10:11:53 -0700 (PDT) Received: from localhost ([195.213.152.26]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a994a4294c8sm380659266b.123.2024.10.08.10.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 10:11:53 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Luis Machado , Tom Tromey Subject: [PATCH 1/5] gdbserver: make arch and osabi names gdb::unique_xmalloc_ptr Date: Tue, 8 Oct 2024 18:11:46 +0100 Message-Id: <642bc25ebd1e94f3378e109256b1c1229fb5f624.1728407374.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Convert target_desc::arch and target_desc::osabi from 'const char*' to gdb::unique_xmalloc_ptr. This also allows us to remove the user defined ~target_desc destructor. I doubt it ever actually occurred, but in theory at least, there was a memory leak in set_tdesc_architecture and set_tdesc_osabi where the member variables were assigned without freeing any previous value... but I suspect that usually these fields are only set once. There should be no user visible changes after this commit. Approved-By: Tom Tromey --- gdbserver/tdesc.cc | 16 +++++----------- gdbserver/tdesc.h | 6 ++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc index 3265793da96..7f11120c318 100644 --- a/gdbserver/tdesc.cc +++ b/gdbserver/tdesc.cc @@ -20,12 +20,6 @@ #ifndef IN_PROCESS_AGENT -target_desc::~target_desc () -{ - xfree ((char *) arch); - xfree ((char *) osabi); -} - bool target_desc::operator== (const target_desc &other) const { if (reg_defs != other.reg_defs) @@ -162,7 +156,7 @@ tdesc_compatible_info_arch_name (const tdesc_compatible_info_up &c_info) const char * tdesc_architecture_name (const struct target_desc *target_desc) { - return target_desc->arch; + return target_desc->arch.get (); } /* See gdbsupport/tdesc.h. */ @@ -171,7 +165,7 @@ void set_tdesc_architecture (struct target_desc *target_desc, const char *name) { - target_desc->arch = xstrdup (name); + target_desc->arch = make_unique_xstrdup (name); } /* See gdbsupport/tdesc.h. */ @@ -179,7 +173,7 @@ set_tdesc_architecture (struct target_desc *target_desc, const char * tdesc_osabi_name (const struct target_desc *target_desc) { - return target_desc->osabi; + return target_desc->osabi.get (); } /* See gdbsupport/tdesc.h. */ @@ -187,7 +181,7 @@ tdesc_osabi_name (const struct target_desc *target_desc) void set_tdesc_osabi (struct target_desc *target_desc, const char *name) { - target_desc->osabi = xstrdup (name); + target_desc->osabi = make_unique_xstrdup (name); } /* See gdbsupport/tdesc.h. */ @@ -198,7 +192,7 @@ tdesc_get_features_xml (const target_desc *tdesc) /* Either .xmltarget or .features is not NULL. */ gdb_assert (tdesc->xmltarget != NULL || (!tdesc->features.empty () - && tdesc->arch != NULL)); + && tdesc_architecture_name (tdesc) != nullptr)); if (tdesc->xmltarget == NULL) { diff --git a/gdbserver/tdesc.h b/gdbserver/tdesc.h index 534b8b000f5..6fc37d038bc 100644 --- a/gdbserver/tdesc.h +++ b/gdbserver/tdesc.h @@ -54,18 +54,16 @@ struct target_desc final : tdesc_element mutable const char *xmltarget = NULL; /* The value of element in the XML, replying GDB. */ - const char *arch = NULL; + gdb::unique_xmalloc_ptr arch = nullptr; /* The value of element in the XML, replying GDB. */ - const char *osabi = NULL; + gdb::unique_xmalloc_ptr osabi = nullptr; public: target_desc () : registers_size (0) {} - ~target_desc (); - bool operator== (const target_desc &other) const; bool operator!= (const target_desc &other) const -- 2.25.4