This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Use gdbpy_ref in archpy_disassemble
- From: Tom Tromey <tromey at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 11 Jan 2017 05:23:17 -0000
- Subject: [binutils-gdb] Use gdbpy_ref in archpy_disassemble
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=59e9e83119a528f17afea89ee22195a95322c6d6
commit 59e9e83119a528f17afea89ee22195a95322c6d6
Author: Tom Tromey <tom@tromey.com>
Date: Sun Nov 20 10:10:58 2016 -0700
Use gdbpy_ref in archpy_disassemble
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.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/python/py-arch.c | 29 +++++++++--------------------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f57d7f..49722e8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
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>
+
* python/python.c (python_run_simple_file): Use
unique_xmalloc_ptr, gdbpy_ref.
diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index 0d32097..13cc9ba 100644
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -22,6 +22,7 @@
#include "arch-utils.h"
#include "disasm.h"
#include "python-internal.h"
+#include "py-ref.h"
typedef struct arch_object_type_object {
PyObject_HEAD
@@ -120,7 +121,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
CORE_ADDR pc;
gdb_py_ulongest start_temp;
long count = 0, i;
- PyObject *result_list, *end_obj = NULL, *count_obj = NULL;
+ PyObject *end_obj = NULL, *count_obj = NULL;
struct gdbarch *gdbarch = NULL;
ARCHPY_REQUIRE_VALID (self, gdbarch);
@@ -149,8 +150,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
#endif
else
{
- Py_DECREF (end_obj);
- Py_XDECREF (count_obj);
PyErr_SetString (PyExc_TypeError,
_("Argument 'end_pc' should be a (long) integer."));
@@ -159,8 +158,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
if (end < start)
{
- Py_DECREF (end_obj);
- Py_XDECREF (count_obj);
PyErr_SetString (PyExc_ValueError,
_("Argument 'end_pc' should be greater than or "
"equal to the argument 'start_pc'."));
@@ -173,8 +170,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
count = PyInt_AsLong (count_obj);
if (PyErr_Occurred () || count < 0)
{
- Py_DECREF (count_obj);
- Py_XDECREF (end_obj);
PyErr_SetString (PyExc_TypeError,
_("Argument 'count' should be an non-negative "
"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)
return NULL;
@@ -199,19 +194,16 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
{
int insn_len = 0;
struct ui_file *memfile = mem_fileopen ();
- PyObject *insn_dict = PyDict_New ();
+ gdbpy_ref insn_dict (PyDict_New ());
if (insn_dict == NULL)
{
- Py_DECREF (result_list);
ui_file_delete (memfile);
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);
return NULL; /* PyList_Append Sets the exception. */
@@ -223,7 +215,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
}
CATCH (except, RETURN_MASK_ALL)
{
- Py_DECREF (result_list);
ui_file_delete (memfile);
gdbpy_convert_exception (except);
@@ -233,17 +224,15 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
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))
- || PyDict_SetItemString (insn_dict, "asm",
+ || PyDict_SetItemString (insn_dict.get (), "asm",
PyString_FromString (!as.empty ()
? as.c_str ()
: "<unknown>"))
- || PyDict_SetItemString (insn_dict, "length",
+ || PyDict_SetItemString (insn_dict.get (), "length",
PyInt_FromLong (insn_len)))
{
- Py_DECREF (result_list);
-
ui_file_delete (memfile);
return NULL;
@@ -254,7 +243,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
ui_file_delete (memfile);
}
- return result_list;
+ return result_list.release ();
}
/* Initializes the Architecture class in the gdb module. */