From 37fce74fb42f45ec340962170a4b297beede733a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 Nov 2016 21:51:20 -0700 Subject: [PATCH] Use gdbpy_ref in gdbpy_lookup_symbol This changes gdbpy_lookup_symbol to use gdbpy_ref. 2017-01-10 Tom Tromey * python/py-symbol.c (gdbpy_lookup_symbol): Use gdbpy_ref. --- gdb/ChangeLog | 4 ++++ gdb/python/py-symbol.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1d3948615a1..ca775856213 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-01-10 Tom Tromey + + * python/py-symbol.c (gdbpy_lookup_symbol): Use gdbpy_ref. + 2017-01-10 Tom Tromey * python/py-value.c (value_has_field, get_field_flag) diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 156a3131249..34e953f494e 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -23,6 +23,7 @@ #include "symtab.h" #include "python-internal.h" #include "objfiles.h" +#include "py-ref.h" typedef struct sympy_symbol_object { PyObject_HEAD @@ -374,7 +375,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) const char *name; static char *keywords[] = { "name", "block", "domain", NULL }; struct symbol *symbol = NULL; - PyObject *block_obj = NULL, *ret_tuple, *sym_obj, *bool_obj; + PyObject *block_obj = NULL, *sym_obj, *bool_obj; const struct block *block = NULL; if (! PyArg_ParseTupleAndKeywords (args, kw, "s|O!i", keywords, &name, @@ -410,31 +411,28 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) } END_CATCH - ret_tuple = PyTuple_New (2); - if (!ret_tuple) + gdbpy_ref ret_tuple (PyTuple_New (2)); + if (ret_tuple == NULL) return NULL; if (symbol) { sym_obj = symbol_to_symbol_object (symbol); if (!sym_obj) - { - Py_DECREF (ret_tuple); - return NULL; - } + return NULL; } else { sym_obj = Py_None; Py_INCREF (Py_None); } - PyTuple_SET_ITEM (ret_tuple, 0, sym_obj); + PyTuple_SET_ITEM (ret_tuple.get (), 0, sym_obj); bool_obj = (is_a_field_of_this.type != NULL) ? Py_True : Py_False; Py_INCREF (bool_obj); - PyTuple_SET_ITEM (ret_tuple, 1, bool_obj); + PyTuple_SET_ITEM (ret_tuple.get (), 1, bool_obj); - return ret_tuple; + return ret_tuple.release (); } /* Implementation of -- 2.30.2