From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id E9MqLba7eWruPxoAWB0awg (envelope-from ) for ; Mon, 10 Aug 2026 07:53:26 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Iw4Zkjmh; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4Yhdk0Jj; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mIOuxZww; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=6BDeZo5r; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A7D331E166; Mon, 10 Aug 2026 07:53:26 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 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 DDC201E033 for ; Mon, 10 Aug 2026 07:53:24 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D3D734BA9012 for ; Mon, 10 Aug 2026 11:53:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3D734BA9012 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Iw4Zkjmh; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4Yhdk0Jj; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mIOuxZww; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=6BDeZo5r Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 5D6AE4BB1C04 for ; Mon, 10 Aug 2026 11:52:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D6AE4BB1C04 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5D6AE4BB1C04 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786362766; cv=none; b=ovyievm8RYJiHAW90frQyAzZHo05eHdjMEeX7ecx5qYQInieyP6nygkWQ3z7kVucVqxdN924O5zRS1YA4lUVdZpCnhYqDDDn8O1No3D1vKw+8N5gvYzXJDL4BhNUz/dtToYJWqoYTdGO7E/ckln4fLHEkkHA4Rbwddw7S1WTN1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786362766; c=relaxed/simple; bh=9ONe2GIv0Z3hSjCiKkrdN7dw+KUJqm1x8/L7zrqvWkI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=tPuPA39fSg9K3m2S9xwgF9xqjKgEPT5nPSnaWapO5xWPmRuELJoJ3on0RLVLCBmtrgjIeLS3KVfYbI6l1ztb7LFiyYjEvsoXl0sZbbH1Aoy7qHSCyz59bSVGHe3rvR7pFfY/tk7iWHeXzyVJczl1X2GyDcAVCjX493vz9C9k1ro= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Iw4Zkjmh; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4Yhdk0Jj; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mIOuxZww; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=6BDeZo5r DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D6AE4BB1C04 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0974E8095E for ; Mon, 10 Aug 2026 11:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1786362761; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PKfGWWftFEpOc40E4hS3xjvSt9J9aSakH+L5z7BNe9w=; b=Iw4ZkjmhIG3IL3ie6y5cE1B2ju6h/RhXUdRz7kT5BzmZm/99PuL3OMKP9IfcpPHHwRC70R TltlfuWQl+vQBQ4iIupApEL7ZTl1R830vS8V7dhUIu3FEu5lvypX5oseYEUD2yUBVMsMpD Lh7BXAFFypPI6aCF5wMkilGa78Eq9po= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1786362761; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PKfGWWftFEpOc40E4hS3xjvSt9J9aSakH+L5z7BNe9w=; b=4Yhdk0Jjd1eyeMfgrkV1bjY3O0wi9zVbSjOnm3ola0tklDPNzozMcS2jqPI7Dl6UWRoTSL udLYOmL/qq50uXAg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mIOuxZww; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=6BDeZo5r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1786362757; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PKfGWWftFEpOc40E4hS3xjvSt9J9aSakH+L5z7BNe9w=; b=mIOuxZwwzHTKrKS7okOGKyAwqZTCkCOQjjpup+cdfnLzxGRH+0ZrO4gdRejlMoz8ScaIIr IrGtunUDsr59TzEszQNLt4oGBNdN/ToY2k3wLQO0Qm62kuh6Y8PlYXAgxXwUc2SGetzSk7 ketrjnlF6ZF/oWqEKPVeqyxkMaPVekY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1786362757; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PKfGWWftFEpOc40E4hS3xjvSt9J9aSakH+L5z7BNe9w=; b=6BDeZo5rKRbFnPYM9wqg7va6HcUaGkyoONWq40AH8F+GSm6Ax8aCkhqAqUFXyZxz4G415G wh8wX5wvwLjmF6BQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DFC6E779B2 for ; Mon, 10 Aug 2026 11:52:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id rQnlNIS7eWorNwAAD6G6ig (envelope-from ) for ; Mon, 10 Aug 2026 11:52:36 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb/python] Convert valpy_call to the "python safety" approach Date: Mon, 10 Aug 2026 13:52:36 +0200 Message-ID: <20260810115236.1087432-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:dkim,sourceware.org:url]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:dkim,sourceware.org:url]; TO_DN_NONE(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 0974E8095E X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action 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 Update function valpy_call to the "python safety" approach. I added wrapper function gdbpy_tuple_check to wrap PyTuple_Check. It always succeeds, so strictly speaking it doesn't need a wrapper, but always using wrapper functions and trusting them to DDRT is easier than remembering which functions always succeed. I also added this template: ... template T gdbpy_require_nonnull (T val) { if (val == nullptr) throw gdb_python_exception (); return val; } ... to do this simplification: ... - vargs[i] = convert_value_from_python (item); + vargs[i] = gdbpy_require_nonnull (convert_value_from_python (item)); - if (vargs[i] == NULL) - throw gdb_python_exception (); ... as a placeholder until convert_value_from_python is converted. Changes in v2: - made valpy_call a method of struct value_object - dropped wrap_tp_call Versions: - v1 https://sourceware.org/pipermail/gdb-patches/2026-August/229279.html --- gdb/python/py-value.c | 93 ++++++++++++++++------------------------ gdb/python/py-wrappers.h | 18 ++++++++ 2 files changed, 56 insertions(+), 55 deletions(-) diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 5b38110396e..767d0d6572d 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -62,6 +62,11 @@ struct value_object : public PyObject PyObject *address; PyObject *dynamic_type; PyObject *content_bytes; + + /* Called by the Python interpreter to perform an inferior function + call on the value. */ + gdbpy_ref<> valpy_call (gdbpy_borrowed_ref<> args, + gdbpy_opt_borrowed_ref<> keywords); }; static_assert (gdb::is_python_allocatable_v); @@ -1164,43 +1169,31 @@ valpy_setitem (PyObject *self, PyObject *key, PyObject *value) } /* Called by the Python interpreter to perform an inferior function - call on the value. Returns NULL on error, with a python exception set. */ -static PyObject * -valpy_call (PyObject *self, PyObject *args, PyObject *keywords) + call on the value. */ +gdbpy_ref<> +value_object::valpy_call (gdbpy_borrowed_ref<> args, + gdbpy_opt_borrowed_ref<> keywords ATTRIBUTE_UNUSED) { Py_ssize_t args_count; - struct value *function = ((value_object *) self)->value; struct value **vargs = NULL; struct type *ftype = NULL; gdbpy_ref<> result; - try - { - ftype = check_typedef (function->type ()); - } - catch (const gdb_exception &except) - { - return gdbpy_handle_gdb_exception (nullptr, except); - } + ftype = check_typedef (value->type ()); if (ftype->code () != TYPE_CODE_FUNC && ftype->code () != TYPE_CODE_METHOD && ftype->code () != TYPE_CODE_INTERNAL_FUNCTION) - { - PyErr_SetString (PyExc_RuntimeError, - _("Value is not callable (not TYPE_CODE_FUNC" - " or TYPE_CODE_METHOD" - " or TYPE_CODE_INTERNAL_FUNCTION).")); - return NULL; - } + gdbpy_err_set_string + (PyExc_RuntimeError, + _("Value is not callable (not TYPE_CODE_FUNC or TYPE_CODE_METHOD" + " or TYPE_CODE_INTERNAL_FUNCTION).")); - if (! PyTuple_Check (args)) - { - PyErr_SetString (PyExc_TypeError, - _("Inferior arguments must be provided in a tuple.")); - return NULL; - } + if (! gdbpy_tuple_check (args)) + gdbpy_err_set_string + (PyExc_TypeError, + _("Inferior arguments must be provided in a tuple.")); - args_count = PyTuple_Size (args); + args_count = gdbpy_tuple_size (args); if (args_count > 0) { int i; @@ -1208,39 +1201,29 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords) vargs = XALLOCAVEC (struct value *, args_count); for (i = 0; i < args_count; i++) { - PyObject *item = PyTuple_GetItem (args, i); - - if (item == NULL) - return NULL; - - vargs[i] = convert_value_from_python (item); - if (vargs[i] == NULL) - return NULL; + gdbpy_borrowed_ref<> item = gdbpy_tuple_get_item (args, i); + vargs[i] = gdbpy_require_nonnull (convert_value_from_python (item)); } } - try - { - scoped_value_mark free_values; + { + scoped_value_mark free_values; - value *return_value; - if (ftype->code () == TYPE_CODE_INTERNAL_FUNCTION) - return_value = call_internal_function (gdbpy_enter::get_gdbarch (), - current_language, - function, args_count, vargs, - EVAL_NORMAL); - else - return_value - = call_function_by_hand (function, NULL, - gdb::make_array_view (vargs, args_count)); - result = value_to_value_object (return_value); - } - catch (const gdb_exception &except) - { - return gdbpy_handle_gdb_exception (nullptr, except); - } + struct value *return_value; + if (ftype->code () == TYPE_CODE_INTERNAL_FUNCTION) + return_value = call_internal_function (gdbpy_enter::get_gdbarch (), + current_language, + value, args_count, vargs, + EVAL_NORMAL); + else + return_value + = call_function_by_hand (value, NULL, + gdb::make_array_view (vargs, args_count)); - return result.release (); + result = value_to_value_object (return_value); + } + + return result; } /* Called by the Python interpreter to obtain string representation @@ -2376,7 +2359,7 @@ PyTypeObject value_object_type = { 0, /*tp_as_sequence*/ &value_object_as_mapping, /*tp_as_mapping*/ valpy_hash, /*tp_hash*/ - valpy_call, /*tp_call*/ + safety_details::varargs_wrapper, /*tp_call*/ valpy_str, /*tp_str*/ 0, /*tp_getattro*/ 0, /*tp_setattro*/ diff --git a/gdb/python/py-wrappers.h b/gdb/python/py-wrappers.h index 6c2b5e4d41e..79cc46fbebf 100644 --- a/gdb/python/py-wrappers.h +++ b/gdb/python/py-wrappers.h @@ -358,4 +358,22 @@ gdbpy_sequence_concat (gdbpy_borrowed_ref<> first, gdbpy_borrowed_ref<> second) return result; } +/* Wrapper for PyTuple_Check. */ +static inline bool +gdbpy_tuple_check (gdbpy_borrowed_ref<> p) +{ + /* Always succeeds. */ + return PyTuple_Check (p); +} + +/* Throw gdb_python_exception if VAL is nullptr. */ +template +T +gdbpy_require_nonnull (T val) +{ + if (val == nullptr) + throw gdb_python_exception (); + return val; +} + #endif /* GDB_PYTHON_PY_WRAPPERS_H */ base-commit: a80fede20bc1330eca5e419392c6595bb3a6ac1d -- 2.51.0