
This changes some utility functions in the Python code to return unique_xmalloc_ptr, and then fixes up the callers. I chose unique_xmalloc_ptr rather than std::string because at a few call points the xmalloc'd string is released and ownership transferred elsewhere. This patch found a few existing memory leaks. For example, py-unwind.c called gdbpy_obj_to_string but never freed the result. Built and regression tested on the buildbot. 2016-11-09 Tom Tromey <tom@tromey.com> * varobj.h (varobj_get_display_hint): Change return type. * varobj.c (varobj_get_display_hint): Return unique_xmalloc_ptr. (varobj_value_get_print_value): Update. * python/python.c (gdbpy_before_prompt_hook, gdbpy_print_stack) (gdbpy_apply_type_printers): Update. * python/python-internal.h (unicode_to_target_string) (python_string_to_target_string, python_string_to_host_string) (gdbpy_obj_to_string, gdbpy_exception_to_string) (gdbpy_get_display_hint): Change return types. * python/py-varobj.c (py_varobj_iter_next): Update. * python/py-value.c (valpy_getitem, convert_value_from_python): Update. * python/py-utils.c (unicode_to_encoded_string) (unicode_to_target_string, python_string_to_target_string) (python_string_to_host_string, gdbpy_obj_to_string) (gdbpy_exception_to_string): Return unique_xmalloc_ptr. * python/py-unwind.c (pyuw_parse_register_id): Update. * python/py-type.c (typy_getitem): Update. * python/py-prettyprint.c (gdbpy_get_display_hint) (print_stack_unless_memory_error, print_children) (gdbpy_apply_val_pretty_printer): Update. * python/py-param.c (set_parameter_value): Update. (get_doc_string, call_doc_function): Return unique_xmalloc_ptr. (get_set_value, get_show_value, compute_enum_values, parmpy_init): Update. * python/py-infthread.c (thpy_set_name): Update. * python/py-function.c (fnpy_call, fnpy_init): Update. * python/py-framefilter.c (extract_sym): Change "name" to unique_xmalloc_ptr. (enumerate_args, enumerate_locals): Update. (py_print_frame): Use unique_xmalloc_ptr. * python/py-frame.c (frapy_read_var): Update. Remove cleanup. * python/py-cmd.c (cmdpy_function, cmdpy_completer, cmdpy_init): Update. * python/py-breakpoint.c (bppy_set_condition): Use unique_xmalloc_ptr. (bppy_init): Likewise. Remove cleanup. (local_setattro): Update. * mi/mi-cmd-var.c (print_varobj, mi_cmd_var_list_children) (varobj_update_one): Update.
203 lines
5.1 KiB
C
203 lines
5.1 KiB
C
/* Copyright (C) 2013-2016 Free Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "python-internal.h"
|
|
#include "varobj.h"
|
|
#include "varobj-iter.h"
|
|
|
|
/* A dynamic varobj iterator "class" for python pretty-printed
|
|
varobjs. This inherits struct varobj_iter. */
|
|
|
|
struct py_varobj_iter
|
|
{
|
|
/* The 'base class'. */
|
|
struct varobj_iter base;
|
|
|
|
/* The python iterator returned by the printer's 'children' method,
|
|
or NULL if not available. */
|
|
PyObject *iter;
|
|
};
|
|
|
|
/* Implementation of the 'dtor' method of pretty-printed varobj
|
|
iterators. */
|
|
|
|
static void
|
|
py_varobj_iter_dtor (struct varobj_iter *self)
|
|
{
|
|
struct py_varobj_iter *dis = (struct py_varobj_iter *) self;
|
|
struct cleanup *back_to = varobj_ensure_python_env (self->var);
|
|
|
|
Py_XDECREF (dis->iter);
|
|
|
|
do_cleanups (back_to);
|
|
}
|
|
|
|
/* Implementation of the 'next' method of pretty-printed varobj
|
|
iterators. */
|
|
|
|
static varobj_item *
|
|
py_varobj_iter_next (struct varobj_iter *self)
|
|
{
|
|
struct py_varobj_iter *t = (struct py_varobj_iter *) self;
|
|
struct cleanup *back_to;
|
|
PyObject *item;
|
|
PyObject *py_v;
|
|
varobj_item *vitem;
|
|
const char *name = NULL;
|
|
|
|
if (!gdb_python_initialized)
|
|
return NULL;
|
|
|
|
back_to = varobj_ensure_python_env (self->var);
|
|
|
|
item = PyIter_Next (t->iter);
|
|
|
|
if (item == NULL)
|
|
{
|
|
/* Normal end of iteration. */
|
|
if (!PyErr_Occurred ())
|
|
return NULL;
|
|
|
|
/* If we got a memory error, just use the text as the item. */
|
|
if (PyErr_ExceptionMatches (gdbpy_gdb_memory_error))
|
|
{
|
|
PyObject *type, *value, *trace;
|
|
char *name_str;
|
|
|
|
PyErr_Fetch (&type, &value, &trace);
|
|
gdb::unique_xmalloc_ptr<char>
|
|
value_str (gdbpy_exception_to_string (type, value));
|
|
Py_XDECREF (type);
|
|
Py_XDECREF (value);
|
|
Py_XDECREF (trace);
|
|
if (value_str == NULL)
|
|
{
|
|
gdbpy_print_stack ();
|
|
return NULL;
|
|
}
|
|
|
|
name_str = xstrprintf ("<error at %d>",
|
|
self->next_raw_index++);
|
|
item = Py_BuildValue ("(ss)", name_str, value_str.get ());
|
|
xfree (name_str);
|
|
if (item == NULL)
|
|
{
|
|
gdbpy_print_stack ();
|
|
return NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Any other kind of error. */
|
|
gdbpy_print_stack ();
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
if (!PyArg_ParseTuple (item, "sO", &name, &py_v))
|
|
{
|
|
gdbpy_print_stack ();
|
|
error (_("Invalid item from the child list"));
|
|
}
|
|
|
|
vitem = new varobj_item ();
|
|
vitem->value = convert_value_from_python (py_v);
|
|
if (vitem->value == NULL)
|
|
gdbpy_print_stack ();
|
|
vitem->name = name;
|
|
|
|
self->next_raw_index++;
|
|
do_cleanups (back_to);
|
|
return vitem;
|
|
}
|
|
|
|
/* The 'vtable' of pretty-printed python varobj iterators. */
|
|
|
|
static const struct varobj_iter_ops py_varobj_iter_ops =
|
|
{
|
|
py_varobj_iter_dtor,
|
|
py_varobj_iter_next
|
|
};
|
|
|
|
/* Constructor of pretty-printed varobj iterators. VAR is the varobj
|
|
whose children the iterator will be iterating over. PYITER is the
|
|
python iterator actually responsible for the iteration. */
|
|
|
|
static void CPYCHECKER_STEALS_REFERENCE_TO_ARG (3)
|
|
py_varobj_iter_ctor (struct py_varobj_iter *self,
|
|
struct varobj *var, PyObject *pyiter)
|
|
{
|
|
self->base.var = var;
|
|
self->base.ops = &py_varobj_iter_ops;
|
|
self->base.next_raw_index = 0;
|
|
self->iter = pyiter;
|
|
}
|
|
|
|
/* Allocate and construct a pretty-printed varobj iterator. VAR is
|
|
the varobj whose children the iterator will be iterating over.
|
|
PYITER is the python iterator actually responsible for the
|
|
iteration. */
|
|
|
|
static struct py_varobj_iter * CPYCHECKER_STEALS_REFERENCE_TO_ARG (2)
|
|
py_varobj_iter_new (struct varobj *var, PyObject *pyiter)
|
|
{
|
|
struct py_varobj_iter *self;
|
|
|
|
self = XNEW (struct py_varobj_iter);
|
|
py_varobj_iter_ctor (self, var, pyiter);
|
|
return self;
|
|
}
|
|
|
|
/* Return a new pretty-printed varobj iterator suitable to iterate
|
|
over VAR's children. */
|
|
|
|
struct varobj_iter *
|
|
py_varobj_get_iterator (struct varobj *var, PyObject *printer)
|
|
{
|
|
PyObject *children;
|
|
PyObject *iter;
|
|
struct py_varobj_iter *py_iter;
|
|
struct cleanup *back_to = varobj_ensure_python_env (var);
|
|
|
|
if (!PyObject_HasAttr (printer, gdbpy_children_cst))
|
|
{
|
|
do_cleanups (back_to);
|
|
return NULL;
|
|
}
|
|
|
|
children = PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
|
|
NULL);
|
|
if (children == NULL)
|
|
{
|
|
gdbpy_print_stack ();
|
|
error (_("Null value returned for children"));
|
|
}
|
|
|
|
make_cleanup_py_decref (children);
|
|
|
|
iter = PyObject_GetIter (children);
|
|
if (iter == NULL)
|
|
{
|
|
gdbpy_print_stack ();
|
|
error (_("Could not get children iterator"));
|
|
}
|
|
|
|
py_iter = py_varobj_iter_new (var, iter);
|
|
|
|
do_cleanups (back_to);
|
|
|
|
return &py_iter->base;
|
|
}
|