From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sUM6Mcqy22p00xAAWB0awg (envelope-from ) for ; Fri, 23 Oct 2026 15:17:30 -0400 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=hWyqo1mN; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id C56A81E033; Fri, 23 Oct 2026 15:17:30 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=no 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 266921E007 for ; Fri, 23 Oct 2026 15:17:30 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EAFEF4BA2E20 for ; Fri, 23 Oct 2026 19:17:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAFEF4BA2E20 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=hWyqo1mN Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 52F5B4BA2E0F for ; Fri, 23 Oct 2026 19:15:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 52F5B4BA2E0F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 52F5B4BA2E0F Authentication-Results: sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1792782952; cv=none; b=w5nRWsoOS4vdXmrYfDp+sOTlzOgotfgXf3H0OvgCs2zLjBS5FZxz0T39AJUUSITeNhBQsckLASo6wEXkFe3/hg+9NF/3lWHQHIdPyuDh+hwLln+ETQqJBHfzbaRwNNuFoxNZHN3JMKGgQtZ53LOHHJpLtdba2O7CWaDIRkxdFy8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1792782952; c=relaxed/simple; bh=l2WbewpkPVSvO83+2/7nAJa+3mwOYjenNJsQVjIR70I=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=cU+pjFP3ZgFGmhIPu7TbqSAuJe4iyaHZeeTCM7w7iNemMSL6XkQe0/JZLj0XDaC3/e3xOqrQB4ko8FX7auYvQvK5pJCGzTR5t7E59aTWQOutLsgffiYQFjqm4dQXwb7cgEHBlm/BWNUEDQ8qucBDKdGGjOsH7wU3BJaFT1025cc= ARC-Authentication-Results: i=1; sourceware.org; dkim=policy (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=hWyqo1mN reason="signing key too small" DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52F5B4BA2E0F Received: from eig-obgw-5004b.ext.cloudfilter.net ([10.0.29.208]) by cmsmtp with ESMTPS id KHa2xismYMylkKKk4xiasH; Fri, 23 Oct 2026 19:15:52 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id KKk2xiRyXirxPKKk3xB7Te; Fri, 23 Oct 2026 19:15:51 +0000 X-Authority-Analysis: v=2.4 cv=FqoF/3rq c=1 sm=1 tr=0 ts=6adbb267 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=ItBw4LHWJt0A:10 a=GzodkQndoNqYNKIrXx0A:9 a=QEXdDO2ut3YA:10 a=O8hF6Hzn-FEA:10 a=DCx65vhANUyCzuf5D8fC:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Unsubscribe-Post:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XL1nWYUopl1du0j0tF8N1rQJjgwMB5JVgEPb1Eh1ugE=; b=hWyqo1mNoc9rIj5k4p+QWSijqo 5bV1l9FYUt5K+O43oG+8tGLv7JjL/nJldoxlJHIA8UNvV0LpW9P+Uj80UWPR0SExM5JvMxVjwYJD6 ZlMh075HTfuv+yHyc91rEV75p; Received: from 97-122-110-129.hlrn.qwest.net ([97.122.110.129]:59452 helo=[192.168.0.17]) by box5379.bluehost.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.100.1) (envelope-from ) id 1xKKk2-00000000DHL-2NZU; Fri, 23 Oct 2026 13:15:50 -0600 From: Tom Tromey Date: Fri, 23 Oct 2026 13:15:49 -0600 Subject: [PATCH 4/6] Some symbol-related Python safety fixes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261023-python-safety-fixmes-v1-4-055b9e1d237b@tromey.com> References: <20261023-python-safety-fixmes-v1-0-055b9e1d237b@tromey.com> In-Reply-To: <20261023-python-safety-fixmes-v1-0-055b9e1d237b@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.110.129 X-Source-L: No X-Exim-ID: 1xKKk2-00000000DHL-2NZU X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-110-129.hlrn.qwest.net ([192.168.0.17]) [97.122.110.129]:59452 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfMRWXK+28t6lCCNTJ4uihLMUZjCXS45BpCP+nTRnEVJt06+cMceYztjaGqlrGzmmNkhJYVUEElCCJRnBCZvMC41VnW0hZKT+3lcXYiRVbKf+c3ANKXk3 Og1qQ64UbaQ7tPO4Ek9sEpSK1TWZijQrqK/qs9CHkCs5Sabk5guE4O/oVqe8BcZ8M2PlsZrYPVdj58lR0VohOKPjwqwf3Basvjc= 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 makes some symbol-related Python safety fixes, with a goal of simplifying some code and removing some FIXMEs. A method can now return a 'symbol *'; this will be handled by a new to_python overload. A safe wrapper is now provided for symbol_to_symbol_object. --- gdb/python/py-frame.c | 9 +++---- gdb/python/py-safety.h | 10 ++++++++ gdb/python/py-symbol.c | 59 ++++++++++++-------------------------------- gdb/python/python-internal.h | 9 ++++--- 4 files changed, 34 insertions(+), 53 deletions(-) diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index 58b08c3d454..e4dd9e9252e 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -103,7 +103,7 @@ struct frame_object : public PyObject /* Implementation of gdb.Frame.function (self) -> gdb.Symbol. Returns the symbol for the function corresponding to this frame. */ - gdbpy_ref<> function (); + symbol *function (); /* Implementation of gdb.Frame.older (self) -> gdb.Frame. Returns the frame immediately older (outer) to this frame, or None if @@ -267,7 +267,7 @@ frame_object::block () } -gdbpy_ref<> +symbol * frame_object::function () { frame_info_ptr frame = require_frame (); @@ -277,10 +277,7 @@ frame_object::function () gdb::unique_xmalloc_ptr funname = find_frame_funname (frame, &funlang, &sym); - if (sym != nullptr) - return symbol_to_symbol_object (sym); - - return py_none (); + return sym; } /* Convert a frame_info struct to a Python Frame object. diff --git a/gdb/python/py-safety.h b/gdb/python/py-safety.h index 0653947fe90..0d5a45e72fd 100644 --- a/gdb/python/py-safety.h +++ b/gdb/python/py-safety.h @@ -120,6 +120,16 @@ to_python (gdbpy_ref<> &&value) return value.release (); } +static inline PyObject * +to_python (symbol *sym) +{ + if (sym == nullptr) + return py_none ().release (); + /* Note that currently this might return NULL on error; but that is + fine in this context. */ + return symbol_to_symbol_object (sym).release (); +} + /* An instantiation of this function is used when calling a gdb method from Python. It accepts some number of arguments (normally gdbpy_borrowed_ref or gdbpy_opt_borrowed_ref), and then calls the diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index b5dcca5658d..0d4515643f5 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -289,6 +289,15 @@ symbol_to_symbol_object (struct symbol *sym) return gdbpy_ref<> (sym_obj); } +gdbpy_ref<> +safe_symbol_to_symbol_object (symbol *sym) +{ + gdbpy_ref<> result = symbol_to_symbol_object (sym); + if (result == nullptr) + throw gdb_python_exception (); + return result; +} + /* Return the symbol that is wrapped by this symbol object. */ struct symbol * symbol_object_to_symbol (PyObject *obj) @@ -363,14 +372,8 @@ gdbpy_lookup_symbol (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw) gdbpy_ref<> ret_tuple = gdbpy_tuple_new (2); gdbpy_ref<> sym_obj; - if (symbol) - { - sym_obj = symbol_to_symbol_object (symbol); - /* FIXME: Python safety. symbol_to_symbol_object should throw, - but the other callers aren't ready for this yet. */ - if (sym_obj == nullptr) - throw gdb_python_exception (); - } + if (symbol != nullptr) + sym_obj = safe_symbol_to_symbol_object (symbol); else sym_obj = py_none (); @@ -386,7 +389,7 @@ gdbpy_lookup_symbol (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw) /* Implementation of gdb.lookup_global_symbol (name [, domain]) -> symbol or None. */ -gdbpy_ref<> +symbol * gdbpy_lookup_global_symbol (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw) { @@ -398,27 +401,13 @@ gdbpy_lookup_global_symbol (gdbpy_borrowed_ref<> args, &domain); domain_search_flags flags = from_scripting_domain (domain); - struct symbol *symbol = lookup_global_symbol (name, NULL, flags).symbol; - - gdbpy_ref<> sym_obj; - if (symbol != nullptr) - { - /* FIXME: Python safety. symbol_to_symbol_object should throw, - but the other callers aren't ready for this yet. */ - sym_obj = symbol_to_symbol_object (symbol); - if (sym_obj == nullptr) - throw gdb_python_exception (); - } - else - sym_obj = py_none (); - - return sym_obj; + return lookup_global_symbol (name, NULL, flags).symbol; } /* Implementation of gdb.lookup_static_symbol (name [, domain]) -> symbol or None. */ -gdbpy_ref<> +symbol * gdbpy_lookup_static_symbol (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw) { @@ -455,19 +444,7 @@ gdbpy_lookup_static_symbol (gdbpy_borrowed_ref<> args, if (symbol == nullptr) symbol = lookup_static_symbol (name, flags).symbol; - gdbpy_ref<> sym_obj; - if (symbol != nullptr) - { - /* FIXME: Python safety. symbol_to_symbol_object should throw, - but the other callers aren't ready for this yet. */ - sym_obj = symbol_to_symbol_object (symbol); - if (sym_obj == nullptr) - throw gdb_python_exception (); - } - else - sym_obj = py_none (); - - return sym_obj; + return symbol; } /* Implementation of @@ -512,11 +489,7 @@ gdbpy_lookup_static_symbols (gdbpy_borrowed_ref<> args, if (symbol != nullptr) { - /* FIXME: Python safety. symbol_to_symbol_object should throw, - but the other callers aren't ready for this yet. */ - gdbpy_ref<> sym_obj = symbol_to_symbol_object (symbol); - if (sym_obj == nullptr) - throw gdb_python_exception (); + gdbpy_ref<> sym_obj = safe_symbol_to_symbol_object (symbol); gdbpy_list_append (return_list, sym_obj); } } diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index b57f3b0123d..5515820411b 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -534,10 +534,10 @@ const char *gdbpy_frame_stop_reason_string (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw); gdbpy_ref<> gdbpy_lookup_symbol (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw); -gdbpy_ref<> gdbpy_lookup_global_symbol (gdbpy_borrowed_ref<> args, - gdbpy_opt_borrowed_ref<> kw); -gdbpy_ref<> gdbpy_lookup_static_symbol (gdbpy_borrowed_ref<> args, - gdbpy_opt_borrowed_ref<> kw); +symbol *gdbpy_lookup_global_symbol (gdbpy_borrowed_ref<> args, + gdbpy_opt_borrowed_ref<> kw); +symbol *gdbpy_lookup_static_symbol (gdbpy_borrowed_ref<> args, + gdbpy_opt_borrowed_ref<> kw); gdbpy_ref<> gdbpy_lookup_static_symbols (gdbpy_borrowed_ref<> args, gdbpy_opt_borrowed_ref<> kw); PyObject *gdbpy_start_recording (PyObject *self, PyObject *args); @@ -572,6 +572,7 @@ void gdbpy_register_tui_window (gdbpy_borrowed_ref<> args, gdbpy_ref<> symtab_and_line_to_sal_object (struct symtab_and_line sal); gdbpy_ref<> symtab_to_symtab_object (struct symtab *symtab); gdbpy_ref<> symbol_to_symbol_object (struct symbol *sym); +gdbpy_ref<> safe_symbol_to_symbol_object (struct symbol *sym); gdbpy_ref<> block_to_block_object (const struct block *block, struct objfile *objfile); gdbpy_ref<> value_to_value_object (struct value *v); -- 2.49.0