From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id S74KBffYAmcaxAMAWB0awg (envelope-from ) for ; Sun, 06 Oct 2024 14:37:43 -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=Vrm80Ujl; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D6B831E355; Sun, 6 Oct 2024 14:37:42 -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 E50D31E354 for ; Sun, 6 Oct 2024 14:37:40 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DF3D3860C2F for ; Sun, 6 Oct 2024 18:37:40 +0000 (GMT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id E62E63858CD9 for ; Sun, 6 Oct 2024 18:37:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E62E63858CD9 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 E62E63858CD9 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728239836; cv=none; b=Lcko7yNhH+pmDv4NLjqGTCVLmV7F6C7VeNDftrmsHMYPxDW4wClJopsxFgSW5mz7TE5W1LakUNKSyMsX5qQCpm+fN8MtroJGXq3b72mj7tC8pyaSbRrk54KY4tyd1rniNWJYuq76BWzyxxbmF3P1f9SwvZbs9WEl40RemmYpsrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728239836; c=relaxed/simple; bh=i3XDyMtYakzLQ0NjbzRmVuwuKu6ks05/zuo17JEXyoY=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=yFnzE7gHNuEoG5wpXUXdLpUPE12JMt8Z0yFPYeIRmUD5DDHxwdpTmXIFOphryOuY8AaXcgDcP4SMLwB7YFgzt1aY+0pEvoaf5kdu331uBlfvu/JmWK58LcYvMcXdfytgGOF/PPPoJ+9xko4Ju8EBR2mLerIIRvpo+vXmg+KbYlk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728239834; 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=9sH3SOcWrsOOkf4mtsiFdOFF2wFoDLYDFt3L0Yx2sr0=; b=Vrm80Ujly8m0+ema2qbMc4A6zOW++dSs9QeTv7mIyUsEwSRE6cv/WqRjupJPLjSuUlZCWN rfQvOD40JF+0PNkR7pQGoEtjulAQUu98FNtTRZs04QTPtH/g0/G93WmB4OpYy2fuSfJhvw IiDHP7GozlUcrQJJ/OLPG1U6Tnh9h2w= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-417-QZ7DLVC4P_-t8Ug4Jp9pJA-1; Sun, 06 Oct 2024 14:37:13 -0400 X-MC-Unique: QZ7DLVC4P_-t8Ug4Jp9pJA-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a8a92ab4dd0so291795066b.1 for ; Sun, 06 Oct 2024 11:37:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728239832; x=1728844632; 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=9sH3SOcWrsOOkf4mtsiFdOFF2wFoDLYDFt3L0Yx2sr0=; b=J4R7IiIm//GEYbnHNCKgWyE+K1DTfjZGe3gVEeDpiks9cmyOHVkB6umlaG267aDb4A DDHUupzk0NaKSIOokyna7IMC1l5GhB9W10uRyCfR/3ACw/4GQSPrUAhXeGFT4Ju024KO LeAtFjvIPa4g871DcJorRZ7fEeInrPrNME0qriVeKVjthffstvGlW7Btu172wtvKoo7y nkXdFV2+NLpOze1B2ZrWVy/4qUhMsa321ObgSdk1zbVi9jwW7XNSCgz27RAlwB7f8dfB 15hMMAHOaWDeWVpkOMKZjDf24tVvA6uaAhdvJ2yR003cFyswXElQvjV8LVaRacgUu1d3 GhLw== X-Gm-Message-State: AOJu0Yy2ic/fmoPaiVBRpZmyNKkiItsxIcS2hyKB1qkFf/yVseQ24oEO WxlDRZuk+qVMc3arVZl1oYY8Ffh/FWWQBEUG6u7XyWX6ZUnUf5b7y2cigsS0T2I7fPL+5ErCmv8 4piqlnvw2WUXOiLe8LQkaLJOiJmGcFaPdf3XNt4zKEY1zUv+D7V3iUQl92qU6GkR+vEzzqO9hWN t0+DddmtW1eU6KVNoaWqrbiqKYYOyxnIqeYDhCGD+wgv8= X-Received: by 2002:a17:907:3608:b0:a8d:250a:52b2 with SMTP id a640c23a62f3a-a991bcf77e3mr1176933666b.6.1728239832069; Sun, 06 Oct 2024 11:37:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFK4J5oh2r4nxS4Dxbmj4h6Hwi6Zyt7QGRqWaeoXI9fKYw+hGIMBXtcY3hYIoOA+xX2En2Tcg== X-Received: by 2002:a17:907:3608:b0:a8d:250a:52b2 with SMTP id a640c23a62f3a-a991bcf77e3mr1176931266b.6.1728239831693; Sun, 06 Oct 2024 11:37:11 -0700 (PDT) Received: from localhost (243.223.159.143.dyn.plus.net. [143.159.223.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9942ee3dffsm187930166b.80.2024.10.06.11.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Oct 2024 11:37:10 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 1/3] gdbserver: make arch and osabi names gdb::unique_xmalloc_ptr Date: Sun, 6 Oct 2024 19:37:05 +0100 Message-Id: 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. --- 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