From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30287 invoked by alias); 28 Aug 2013 12:04:54 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 30274 invoked by uid 89); 28 Aug 2013 12:04:54 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 28 Aug 2013 12:04:54 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.4 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7SC4pL9030538 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Aug 2013 08:04:51 -0400 Received: from localhost.localdomain (ovpn-112-21.ams2.redhat.com [10.36.112.21]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7SC4nFl018504 for ; Wed, 28 Aug 2013 08:04:50 -0400 Message-ID: <521DE761.6010403@redhat.com> Date: Wed, 28 Aug 2013 12:04:00 -0000 From: Phil Muldoon MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: [patch] [python] PR python/15461 (gate architecture calls) Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-08/txt/msg00818.txt.bz2 This patch gates calls to architecture.name and architecture.disassemble. If the underlying GDB architecture is NULL, calls to those Python functions will result in an assert call. Something I thought about is not allowing gdb.Architecture to be instantiated directly, but I could not think of a clean way to do this. Also, all other GDB Python classes can be instantiated (though, not very usefully, IE foo = gdb.Frame()) In any case, this patch gates those calls mentioned above. Cheers, Phil 2013-08-28 Phil Muldoon PR python/15461 * python/py-arch.c (ARCHPY_REQUIRE_VALID): New macro. (archpy_name): Check for valid architecture. (archpy_disassemble): Ditto. 2013-08-28 Phil Muldoon * gdb.python/py-arch.exp: Tests for invalid architecture. -- diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c index 7098a8a..2775c9d 100644 --- a/gdb/python/py-arch.c +++ b/gdb/python/py-arch.c @@ -30,6 +30,14 @@ typedef struct arch_object_type_object { static struct gdbarch_data *arch_object_data = NULL; +/* Require a valid Architecture. */ +#define ARCHPY_REQUIRE_VALID (arch_obj, arch) \ + do { \ + arch = arch_object_to_gdbarch (arch_obj); \ + if (arch == NULL) \ + error (_("Architecture is invalid.")); \ + } while (0) + static PyTypeObject arch_object_type CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("arch_object"); @@ -82,9 +90,19 @@ gdbarch_to_arch_object (struct gdbarch *gdbarch) static PyObject * archpy_name (PyObject *self, PyObject *args) { - struct gdbarch *gdbarch = arch_object_to_gdbarch (self); - const char *name = (gdbarch_bfd_arch_info (gdbarch))->printable_name; - PyObject *py_name = PyString_FromString (name); + struct gdbarch *gdbarch = NULL; + const char *name; + PyObject *py_name; + volatile struct gdb_exception except; + + TRY_CATCH (except, RETURN_MASK_ALL) + { + ARCHPY_REQUIRE_VALID (self, gdbarch); + } + GDB_PY_HANDLE_EXCEPTION (except); + + name = (gdbarch_bfd_arch_info (gdbarch))->printable_name; + py_name = PyString_FromString (name); return py_name; } @@ -104,7 +122,14 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw) gdb_py_ulongest start_temp; long count = 0, i; PyObject *result_list, *end_obj = NULL, *count_obj = NULL; - struct gdbarch *gdbarch = arch_object_to_gdbarch (self); + struct gdbarch *gdbarch = NULL; + volatile struct gdb_exception except; + + TRY_CATCH (except, RETURN_MASK_ALL) + { + ARCHPY_REQUIRE_VALID (self, gdbarch); + } + GDB_PY_HANDLE_EXCEPTION (except); if (!PyArg_ParseTupleAndKeywords (args, kw, GDB_PY_LLU_ARG "|OO", keywords, &start_temp, &end_obj, &count_obj)) diff --git a/gdb/testsuite/gdb.python/py-arch.exp b/gdb/testsuite/gdb.python/py-arch.exp index 4e736b8..0d32ef7 100644 --- a/gdb/testsuite/gdb.python/py-arch.exp +++ b/gdb/testsuite/gdb.python/py-arch.exp @@ -12,6 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib gdb-python.exp standard_testfile @@ -26,6 +27,14 @@ if ![runto_main] { return -1 } +# Test python/15461. Invalid architectures should not trigger an +# internal GDB assert. +gdb_py_test_silent_cmd "python empty = gdb.Architecture()" "get empty arch" 0 +gdb_test "python print(empty.name())" ".*Architecture is invalid.*" \ + "Test empty architecture.name does not trigger an assert" +gdb_test "python print(empty.disassemble())" ".*Architecture is invalid.*" \ + "Test empty architecture.disassemble does not trigger an assert" + gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "get frame" 0 gdb_py_test_silent_cmd "python arch = frame.architecture()" "get arch" 0 gdb_py_test_silent_cmd "python pc = frame.pc()" "get pc" 0