From 96d9056e29036d7d841e71f60648018f115d808e Mon Sep 17 00:00:00 2001 From: Phil Muldoon Date: Fri, 30 Aug 2013 10:12:19 +0000 Subject: [PATCH] 2013-08-30 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-30 Phil Muldoon * gdb.python/py-arch.exp: Tests for invalid architecture. --- gdb/ChangeLog | 8 ++++++++ gdb/python/py-arch.c | 27 +++++++++++++++++++++++---- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.python/py-arch.exp | 8 ++++++++ 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f676c3f3eaa..a03e72ce816 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2013-08-30 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-29 Joel Brobecker * rs6000-nat.c (rs6000_ptrace32): Cast "addr" to "uintptr_t" diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c index 7098a8ab5b8..a31ffdd9ed8 100644 --- a/gdb/python/py-arch.c +++ b/gdb/python/py-arch.c @@ -30,6 +30,18 @@ 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) \ + { \ + PyErr_SetString (PyExc_RuntimeError, \ + _("Architecture is invalid.")); \ + return NULL; \ + } \ + } while (0) + static PyTypeObject arch_object_type CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("arch_object"); @@ -82,9 +94,14 @@ 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; + + ARCHPY_REQUIRE_VALID (self, gdbarch); + + name = (gdbarch_bfd_arch_info (gdbarch))->printable_name; + py_name = PyString_FromString (name); return py_name; } @@ -104,7 +121,9 @@ 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; + + ARCHPY_REQUIRE_VALID (self, gdbarch); if (!PyArg_ParseTupleAndKeywords (args, kw, GDB_PY_LLU_ARG "|OO", keywords, &start_temp, &end_obj, &count_obj)) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3b259c7cd4d..67dc81367b8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-08-30 Phil Muldoon + + * gdb.python/py-arch.exp: Tests for invalid architecture. + 2013-08-29 Sterling Augustine * boards/remote-stdio-gdbserver.exp: Set rcp_prog and diff --git a/gdb/testsuite/gdb.python/py-arch.exp b/gdb/testsuite/gdb.python/py-arch.exp index 7413b44096a..174b151c1cd 100644 --- a/gdb/testsuite/gdb.python/py-arch.exp +++ b/gdb/testsuite/gdb.python/py-arch.exp @@ -26,6 +26,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 -- 2.30.2