From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mQfZBI7MmGnGNAMAWB0awg (envelope-from ) for ; Fri, 20 Feb 2026 16:05:18 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=SAGq04Df; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E6BB51E08D; Fri, 20 Feb 2026 16:05:17 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 C41691E08D for ; Fri, 20 Feb 2026 16:05:16 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 41AC44BAD149 for ; Fri, 20 Feb 2026 21:05:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 41AC44BAD149 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=SAGq04Df Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by sourceware.org (Postfix) with ESMTPS id 9C0464BA23E0 for ; Fri, 20 Feb 2026 21:03:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C0464BA23E0 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9C0464BA23E0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771621430; cv=none; b=pLJbYB5qHVTZKwWl1wUA5FhMU8i/x/9pXa07ZufguirnYw70hIuirujhNuTRJeLo9t6d/S09gwXNbrDUItl2EfMTBgyoZs5gW9TOKqvSmQAtIFku1hZJg+/reLC4V8UomRB62wEUc4LnJRBXw/13Qz0dCjVcH1Arxn0MGcv5ykc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771621430; c=relaxed/simple; bh=Xk2of40QB9r7WDpsHgsSdqtXRLpqO+dG2M30y4hMyH4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=w2IG/PPd02OxkJyB+3x3D21yTk1S8nyePymjy9k0VZQ/CfkCErK1RrgQtuHRCcrIX1TpdH1A/3gTLPfxP7x9M2PfPrGU3w5MnyBjzFOsrK1BQtmtSueouLuRo5v/a/9ZHIxXu6PI47wTpRBc6Cn2NucZ1/G0JdYqR8O+0VMY3GY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C0464BA23E0 Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-662f9aeb782so1495008eaf.3 for ; Fri, 20 Feb 2026 13:03:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1771621430; x=1772226230; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=74kaKgTUUp4JeA5Qw7G2xcH6rmeE9Gl/lbHLJs38uQs=; b=SAGq04DfYL3ZtYioB9sTID0yyiFXiZ2q2r6kYf3rT55yBDFJx6OxRiW84z2w304GOF vjdThsqtFj3j6O3sGADqfc1Pjf5KLGu0rXb92N57kEjXGsDL/DPiYh56Ue2RTh11mhiY enHyw6wp2iZbrWqFQtd32SN/V+khXZPVIkoeneE7PA//s4nd/Ewg9/6iGr7lGdI/YEtm i3Kx/ULRDVx76O9jqTXCH0/Teu7wQstNgb55eWMu+YsZaZZ1twXsqGV3Z/P11uS2dHPD 5OBPWU8zxINAhUsjUzjXp3r6Z7RjRe1vdW2NL/DpFEGx4M5Ja8xrFUkWJh8jDLCenPf/ CFNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771621430; x=1772226230; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=74kaKgTUUp4JeA5Qw7G2xcH6rmeE9Gl/lbHLJs38uQs=; b=NR0mU9F6FXVc4Oc1sShKCASclivjKd/uPMDxVLtLqfgbegsw2EscU0COWUbL2vPnhw gQJBLnAK5DEhNxDB1ox/TgbQhjBYlHTv4dGW+TO9npWXG6E2xWjhBeOY+HhS8WyW5y+8 BNN0kIkb0Mcq+Y+/sinFukycNPhBHQsZTo/UOX8gT/F2+8scKWj6PKQsCVI5bWg+/ROJ 0SV66+qOSZoj6XEv9KrSW8ARHmSRcw6VCnQTfR4/84LVkmdeC2bv7+zKZ60FKBBXEOWU W9RDy1aZ/YeqtVQlPuFtg5GHhFVc1ErRSJP5iybyCju/TxO4oY9Y+PHP/ZpG3KL13nI5 YMmA== X-Gm-Message-State: AOJu0Yx7uG3LD2jnbefWoJ1FPcpepWQ529dtb7nnlrfRNlKlpd2GViiv H8EhJBEw9IxgqRUHJAWNYh/2mUBbeEr56GhT2mAsz07SHnoXgkSv7DpS1lNyJNoQoA== X-Gm-Gg: AZuq6aJtstvgXlJEuVtcp64RZb7UUynX4+dkW//3ivNzFrlz+e4KphxjDsMcdNqA6Lm 4r2/Ajq1wTjVXqUGXHPMovy+eC1H+DK0RMaAZVfAL9ke4KY6wVyGabCB0la9aWBGQUGspn3Gto5 MmR0mdRprSb+1i5giGid+qhd/0rwYfTmxGq+VSV3DXF26KxMAeKcuLr9VOoOetzYICZMrWi49Rk mIep7CYIXF2Y3cRVOeTZvGlzoUmvWXlhNLemqGJNhyUlgJJyOwZO7HeCttBA9OCiqIzmNuF++BV Qyfp2fi3YrJYekfzDf1b1hA+XPa+gZG0K9lur/TlXr9gE0ENtjhU11Ycek8/3n93iJcG1dIoTQ2 1eS3RrCccphSDNNupwxCKzK130Mtg8KPyVsUduaTBtDGnf3/ye5hjyrNkSUT0rZYHrFLyNK8pj0 TXzpEljTtNvs4hIYrRHuAW0ZcaivOdDVt0UbohPKavUxfi3nQqWCpPMMXA X-Received: by 2002:a05:6820:2d02:b0:66e:1928:ca46 with SMTP id 006d021491bc7-679c464661cmr690191eaf.8.1771621429739; Fri, 20 Feb 2026 13:03:49 -0800 (PST) Received: from [192.168.0.26] (97-122-122-234.hlrn.qwest.net. [97.122.122.234]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4157d2d7826sm561630fac.10.2026.02.20.13.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 13:03:49 -0800 (PST) From: Tom Tromey Date: Fri, 20 Feb 2026 14:03:47 -0700 Subject: [PATCH 01/10] Return gdbpy_ref<> from symtab_and_line_to_sal_object MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260220-python-safety-minor-v1-1-4c4b12e445af@adacore.com> References: <20260220-python-safety-minor-v1-0-4c4b12e445af@adacore.com> In-Reply-To: <20260220-python-safety-minor-v1-0-4c4b12e445af@adacore.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 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 This changes symtab_and_line_to_sal_object to return a gdbpy_ref<>, using the type system to convey that a new reference is always returned. --- gdb/python/py-frame.c | 4 ++-- gdb/python/py-progspace.c | 4 ++-- gdb/python/py-record-btrace.c | 4 ++-- gdb/python/py-symtab.c | 4 ++-- gdb/python/py-unwind.c | 4 ++-- gdb/python/python-internal.h | 2 +- gdb/python/python.c | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index ab7883b4e73..8b50307c099 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -466,7 +466,7 @@ static PyObject * frapy_find_sal (PyObject *self, PyObject *args) { frame_info_ptr frame; - PyObject *sal_obj = NULL; /* Initialize to appease gcc warning. */ + gdbpy_ref<> sal_obj; try { @@ -480,7 +480,7 @@ frapy_find_sal (PyObject *self, PyObject *args) return gdbpy_handle_gdb_exception (nullptr, except); } - return sal_obj; + return sal_obj.release (); } /* Implementation of gdb.Frame.read_var_value (self, variable, diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c index 19f5e533b0a..8b5ada2dc2e 100644 --- a/gdb/python/py-progspace.c +++ b/gdb/python/py-progspace.c @@ -534,7 +534,7 @@ static PyObject * pspy_find_pc_line (PyObject *o, PyObject *args) { CORE_ADDR pc; - PyObject *result = NULL; /* init for gcc -Wall */ + gdbpy_ref<> result; PyObject *pc_obj; pspace_object *self = (pspace_object *) o; @@ -560,7 +560,7 @@ pspy_find_pc_line (PyObject *o, PyObject *args) return gdbpy_handle_gdb_exception (nullptr, except); } - return result; + return result.release (); } /* Implementation of is_valid (self) -> Boolean. diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c index 3fcf653f4ba..90d9ecd95a8 100644 --- a/gdb/python/py-record-btrace.c +++ b/gdb/python/py-record-btrace.c @@ -205,7 +205,7 @@ PyObject * recpy_bt_insn_sal (PyObject *self, void *closure) { const btrace_insn * const insn = btrace_insn_from_recpy_insn (self); - PyObject *result = NULL; + gdbpy_ref<> result; if (insn == NULL) return NULL; @@ -219,7 +219,7 @@ recpy_bt_insn_sal (PyObject *self, void *closure) return gdbpy_handle_gdb_exception (nullptr, except); } - return result; + return result.release (); } /* Implementation of RecordInstruction.pc [int] for btrace. diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c index 2dca0083277..820542932ba 100644 --- a/gdb/python/py-symtab.c +++ b/gdb/python/py-symtab.c @@ -390,7 +390,7 @@ symtab_to_symtab_object (struct symtab *symtab) /* Create a new symtab and line (gdb.Symtab_and_line) object that encapsulates the symtab_and_line structure from GDB. */ -PyObject * +gdbpy_ref<> symtab_and_line_to_sal_object (struct symtab_and_line sal) { sal_object *sal_obj; @@ -399,7 +399,7 @@ symtab_and_line_to_sal_object (struct symtab_and_line sal) if (sal_obj != nullptr) set_sal (sal_obj, sal); - return (PyObject *) sal_obj; + return gdbpy_ref<> (sal_obj); } /* Return struct symtab_and_line reference that is wrapped by this diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index d4c35e17f14..96e11137be6 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -613,7 +613,7 @@ pending_framepy_find_sal (PyObject *self, PyObject *args) PENDING_FRAMEPY_REQUIRE_VALID (pending_frame); - PyObject *sal_obj = nullptr; + gdbpy_ref<> sal_obj; try { @@ -627,7 +627,7 @@ pending_framepy_find_sal (PyObject *self, PyObject *args) return gdbpy_handle_gdb_exception (nullptr, except); } - return sal_obj; + return sal_obj.release (); } /* Implement PendingFrame.block(). Return a gdb.Block for the pending diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 8925714f3c1..feabf270464 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -495,7 +495,7 @@ gdb::unique_xmalloc_ptr gdbpy_parse_command_name PyObject *gdbpy_register_tui_window (PyObject *self, PyObject *args, PyObject *kw); -PyObject *symtab_and_line_to_sal_object (struct symtab_and_line sal); +gdbpy_ref<> symtab_and_line_to_sal_object (struct symtab_and_line sal); PyObject *symtab_to_symtab_object (struct symtab *symtab); PyObject *symbol_to_symbol_object (struct symbol *sym); PyObject *block_to_block_object (const struct block *block, diff --git a/gdb/python/python.c b/gdb/python/python.c index 79b5d24d1cf..d2a77890072 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1020,11 +1020,11 @@ gdbpy_decode_line (PyObject *self, PyObject *args) return NULL; for (size_t i = 0; i < sals.size (); ++i) { - PyObject *obj = symtab_and_line_to_sal_object (sals[i]); - if (obj == NULL) - return NULL; + gdbpy_ref<> obj = symtab_and_line_to_sal_object (sals[i]); + if (obj == nullptr) + return nullptr; - PyTuple_SetItem (result.get (), i, obj); + PyTuple_SetItem (result.get (), i, obj.release ()); } } else -- 2.53.0