FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2013-08-30 Phil Muldoon <pmuldoon@redhat.com>

Browse source 
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  <pmuldoon@redhat.com>

	* gdb.python/py-arch.exp: Tests for invalid architecture.
This commit is contained in:
Phil Muldoon 2013-08-30 10:12:19 +00:00
parent e2668a1a80
commit 96d9056e29
4 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2013-08-30 Phil Muldoon <pmuldoon@redhat.com>
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 <brobecker@adacore.com>
* rs6000-nat.c (rs6000_ptrace32): Cast "addr" to "uintptr_t"

27
gdb/python/py-arch.c
View file

@ -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))

4
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2013-08-30 Phil Muldoon <pmuldoon@redhat.com>
* gdb.python/py-arch.exp: Tests for invalid architecture.
2013-08-29 Sterling Augustine <saugustine@google.com>
* boards/remote-stdio-gdbserver.exp: Set rcp_prog and

8
gdb/testsuite/gdb.python/py-arch.exp
View file

@ -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