mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-19 22:44:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use gdbpy_ref in archpy_disassemble

Browse Source 
This changes archpy_disassemble to use gdbpy_ref.  It also fixes a
latent bug where archpy_disassemble was decref'ing the results of a
all to PyArg_ParseTupleAndKeywords.  This is incorrect because
PyArg_ParseTupleAndKeywords returns borrowed references.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* python/py-arch.c (archpy_disassemble): Use gdbpy_ref.  Don't
	decref results of PyArg_ParseTupleAndKeywords.
This commit is contained in:
Tom Tromey 2016-11-20 10:10:58 -07:00
parent 9de10f6d53
commit 59e9e83119
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-arch.c (archpy_disassemble): Use gdbpy_ref. Don't
decref results of PyArg_ParseTupleAndKeywords.
2017-01-10 Tom Tromey <tom@tromey.com> 2017-01-10 Tom Tromey <tom@tromey.com>
* python/python.c (python_run_simple_file): Use * python/python.c (python_run_simple_file): Use

29
gdb/python/py-arch.c
View File

@ -22,6 +22,7 @@
#include "arch-utils.h" #include "arch-utils.h"
#include "disasm.h" #include "disasm.h"
#include "python-internal.h" #include "python-internal.h"
#include "py-ref.h"
typedef struct arch_object_type_object { typedef struct arch_object_type_object {
PyObject_HEAD PyObject_HEAD
@ -120,7 +121,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
CORE_ADDR pc; CORE_ADDR pc;
gdb_py_ulongest start_temp; gdb_py_ulongest start_temp;
long count = 0, i; long count = 0, i;
PyObject *result_list, *end_obj = NULL, *count_obj = NULL; PyObject *end_obj = NULL, *count_obj = NULL;
struct gdbarch *gdbarch = NULL; struct gdbarch *gdbarch = NULL;
ARCHPY_REQUIRE_VALID (self, gdbarch); ARCHPY_REQUIRE_VALID (self, gdbarch);
@ -149,8 +150,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
#endif #endif
else else
{ {
Py_DECREF (end_obj);
Py_XDECREF (count_obj);
PyErr_SetString (PyExc_TypeError, PyErr_SetString (PyExc_TypeError,
_("Argument 'end_pc' should be a (long) integer.")); _("Argument 'end_pc' should be a (long) integer."));
@ -159,8 +158,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
if (end < start) if (end < start)
{ {
Py_DECREF (end_obj);
Py_XDECREF (count_obj);
PyErr_SetString (PyExc_ValueError, PyErr_SetString (PyExc_ValueError,
_("Argument 'end_pc' should be greater than or " _("Argument 'end_pc' should be greater than or "
"equal to the argument 'start_pc'.")); "equal to the argument 'start_pc'."));
@ -173,8 +170,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
count = PyInt_AsLong (count_obj); count = PyInt_AsLong (count_obj);
if (PyErr_Occurred () || count < 0) if (PyErr_Occurred () || count < 0)
{ {
Py_DECREF (count_obj);
Py_XDECREF (end_obj);
PyErr_SetString (PyExc_TypeError, PyErr_SetString (PyExc_TypeError,
_("Argument 'count' should be an non-negative " _("Argument 'count' should be an non-negative "
"integer.")); "integer."));
@ -183,7 +178,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
} }
} }
result_list = PyList_New (0); gdbpy_ref result_list (PyList_New (0));
if (result_list == NULL) if (result_list == NULL)
return NULL; return NULL;
@ -199,19 +194,16 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
{ {
int insn_len = 0; int insn_len = 0;
struct ui_file *memfile = mem_fileopen (); struct ui_file *memfile = mem_fileopen ();
PyObject *insn_dict = PyDict_New (); gdbpy_ref insn_dict (PyDict_New ());
if (insn_dict == NULL) if (insn_dict == NULL)
{ {
Py_DECREF (result_list);
ui_file_delete (memfile); ui_file_delete (memfile);
return NULL; return NULL;
} }
if (PyList_Append (result_list, insn_dict)) if (PyList_Append (result_list.get (), insn_dict.get ()))
{ {
Py_DECREF (result_list);
Py_DECREF (insn_dict);
ui_file_delete (memfile); ui_file_delete (memfile);
return NULL; /* PyList_Append Sets the exception. */ return NULL; /* PyList_Append Sets the exception. */
@ -223,7 +215,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
} }
CATCH (except, RETURN_MASK_ALL) CATCH (except, RETURN_MASK_ALL)
{ {
Py_DECREF (result_list);
ui_file_delete (memfile); ui_file_delete (memfile);
gdbpy_convert_exception (except); gdbpy_convert_exception (except);
@ -233,17 +224,15 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
std::string as = ui_file_as_string (memfile); std::string as = ui_file_as_string (memfile);
if (PyDict_SetItemString (insn_dict, "addr", if (PyDict_SetItemString (insn_dict.get (), "addr",
gdb_py_long_from_ulongest (pc)) gdb_py_long_from_ulongest (pc))
|| PyDict_SetItemString (insn_dict, "asm", || PyDict_SetItemString (insn_dict.get (), "asm",
PyString_FromString (!as.empty () PyString_FromString (!as.empty ()
? as.c_str () ? as.c_str ()
: "<unknown>")) : "<unknown>"))
|| PyDict_SetItemString (insn_dict, "length", || PyDict_SetItemString (insn_dict.get (), "length",
PyInt_FromLong (insn_len))) PyInt_FromLong (insn_len)))
{ {
Py_DECREF (result_list);
ui_file_delete (memfile); ui_file_delete (memfile);
return NULL; return NULL;
@ -254,7 +243,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
ui_file_delete (memfile); ui_file_delete (memfile);
} }
return result_list; return result_list.release ();
} }
/* Initializes the Architecture class in the gdb module. */ /* Initializes the Architecture class in the gdb module. */