Use unique_xmalloc_ptr in Python code

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.
This commit is contained in:
Tom Tromey
2016-10-15 09:20:02 -06:00
parent 4e9d215322
commit 9b9720149d
19 changed files with 207 additions and 225 deletions

View File

@ -440,7 +440,8 @@ bppy_get_condition (PyObject *self, void *closure)
static int
bppy_set_condition (PyObject *self, PyObject *newvalue, void *closure)
{
char *exp;
gdb::unique_xmalloc_ptr<char> exp_holder;
const char *exp = NULL;
gdbpy_breakpoint_object *self_bp = (gdbpy_breakpoint_object *) self;
struct gdb_exception except = exception_none;
@ -456,9 +457,10 @@ bppy_set_condition (PyObject *self, PyObject *newvalue, void *closure)
exp = "";
else
{
exp = python_string_to_host_string (newvalue);
if (exp == NULL)
exp_holder = python_string_to_host_string (newvalue);
if (exp_holder == NULL)
return -1;
exp = exp_holder.get ();
}
TRY
@ -471,9 +473,6 @@ bppy_set_condition (PyObject *self, PyObject *newvalue, void *closure)
}
END_CATCH
if (newvalue != Py_None)
xfree (exp);
GDB_PY_SET_HANDLE_EXCEPTION (except);
return 0;
@ -680,18 +679,20 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
TRY
{
char *copy = xstrdup (skip_spaces_const (spec));
struct cleanup *cleanup = make_cleanup (xfree, copy);
gdb::unique_xmalloc_ptr<char>
copy_holder (xstrdup (skip_spaces_const (spec)));
char *copy = copy_holder.get ();
switch (type)
{
case bp_breakpoint:
{
struct event_location *location;
struct cleanup *cleanup;
location
= string_to_event_location_basic (&copy, current_language);
make_cleanup_delete_event_location (location);
cleanup = make_cleanup_delete_event_location (location);
create_breakpoint (python_gdbarch,
location, NULL, -1, NULL,
0,
@ -700,6 +701,8 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
AUTO_BOOLEAN_TRUE,
&bkpt_breakpoint_ops,
0, 1, internal_bp, 0);
do_cleanups (cleanup);
break;
}
case bp_watchpoint:
@ -717,8 +720,6 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
default:
error(_("Do not understand breakpoint type to set."));
}
do_cleanups (cleanup);
}
CATCH (except, RETURN_MASK_ALL)
{
@ -1043,7 +1044,7 @@ static int
local_setattro (PyObject *self, PyObject *name, PyObject *v)
{
gdbpy_breakpoint_object *obj = (gdbpy_breakpoint_object *) self;
char *attr = python_string_to_host_string (name);
gdb::unique_xmalloc_ptr<char> attr (python_string_to_host_string (name));
if (attr == NULL)
return -1;
@ -1051,7 +1052,7 @@ local_setattro (PyObject *self, PyObject *name, PyObject *v)
/* If the attribute trying to be set is the "stop" method,
but we already have a condition set in the CLI or other extension
language, disallow this operation. */
if (strcmp (attr, stop_func) == 0)
if (strcmp (attr.get (), stop_func) == 0)
{
const struct extension_language_defn *extlang = NULL;
@ -1063,7 +1064,6 @@ local_setattro (PyObject *self, PyObject *name, PyObject *v)
{
char *error_text;
xfree (attr);
error_text
= xstrprintf (_("Only one stop condition allowed. There is"
" currently a %s stop condition defined for"
@ -1075,8 +1075,6 @@ local_setattro (PyObject *self, PyObject *name, PyObject *v)
}
}
xfree (attr);
return PyObject_GenericSetAttr ((PyObject *)self, name, v);
}