mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-28 22:21:26 +08:00
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:
@ -52,8 +52,9 @@ enum mi_print_types
|
||||
appropriate Python exception set, and EXT_LANG_BT_OK on success. */
|
||||
|
||||
static enum ext_lang_bt_status
|
||||
extract_sym (PyObject *obj, char **name, struct symbol **sym,
|
||||
struct block **sym_block, const struct language_defn **language)
|
||||
extract_sym (PyObject *obj, gdb::unique_xmalloc_ptr<char> *name,
|
||||
struct symbol **sym, struct block **sym_block,
|
||||
const struct language_defn **language)
|
||||
{
|
||||
PyObject *result = PyObject_CallMethod (obj, "symbol", NULL);
|
||||
|
||||
@ -101,7 +102,7 @@ extract_sym (PyObject *obj, char **name, struct symbol **sym,
|
||||
|
||||
/* Duplicate the symbol name, so the caller has consistency
|
||||
in garbage collection. */
|
||||
*name = xstrdup (SYMBOL_PRINT_NAME (*sym));
|
||||
name->reset (xstrdup (SYMBOL_PRINT_NAME (*sym)));
|
||||
|
||||
/* If a symbol is specified attempt to determine the language
|
||||
from the symbol. If mode is not "auto", then the language
|
||||
@ -538,7 +539,7 @@ enumerate_args (PyObject *iter,
|
||||
while (item)
|
||||
{
|
||||
const struct language_defn *language;
|
||||
char *sym_name;
|
||||
gdb::unique_xmalloc_ptr<char> sym_name;
|
||||
struct symbol *sym;
|
||||
struct block *sym_block;
|
||||
struct value *val;
|
||||
@ -554,7 +555,6 @@ enumerate_args (PyObject *iter,
|
||||
success = extract_value (item, &val);
|
||||
if (success == EXT_LANG_BT_ERROR)
|
||||
{
|
||||
xfree (sym_name);
|
||||
Py_DECREF (item);
|
||||
goto error;
|
||||
}
|
||||
@ -564,10 +564,7 @@ enumerate_args (PyObject *iter,
|
||||
|
||||
if (sym && ui_out_is_mi_like_p (out)
|
||||
&& ! mi_should_print (sym, MI_PRINT_ARGS))
|
||||
{
|
||||
xfree (sym_name);
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
|
||||
/* If the object did not provide a value, read it using
|
||||
read_frame_args and account for entry values, if any. */
|
||||
@ -581,7 +578,6 @@ enumerate_args (PyObject *iter,
|
||||
{
|
||||
PyErr_SetString (PyExc_RuntimeError,
|
||||
_("No symbol or value provided."));
|
||||
xfree (sym_name);
|
||||
goto error;
|
||||
}
|
||||
|
||||
@ -591,7 +587,6 @@ enumerate_args (PyObject *iter,
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ALL)
|
||||
{
|
||||
xfree (sym_name);
|
||||
gdbpy_convert_exception (except);
|
||||
goto error;
|
||||
}
|
||||
@ -611,7 +606,6 @@ enumerate_args (PyObject *iter,
|
||||
{
|
||||
xfree (arg.error);
|
||||
xfree (entryarg.error);
|
||||
xfree (sym_name);
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
@ -629,7 +623,6 @@ enumerate_args (PyObject *iter,
|
||||
{
|
||||
xfree (arg.error);
|
||||
xfree (entryarg.error);
|
||||
xfree (sym_name);
|
||||
gdbpy_convert_exception (except);
|
||||
goto error;
|
||||
}
|
||||
@ -642,7 +635,6 @@ enumerate_args (PyObject *iter,
|
||||
{
|
||||
xfree (arg.error);
|
||||
xfree (entryarg.error);
|
||||
xfree (sym_name);
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
@ -655,18 +647,13 @@ enumerate_args (PyObject *iter,
|
||||
/* If the object has provided a value, we just print that. */
|
||||
if (val != NULL)
|
||||
{
|
||||
if (py_print_single_arg (out, sym_name, NULL, val, &opts,
|
||||
if (py_print_single_arg (out, sym_name.get (), NULL, val, &opts,
|
||||
args_type, print_args_field,
|
||||
language) == EXT_LANG_BT_ERROR)
|
||||
{
|
||||
xfree (sym_name);
|
||||
goto error;
|
||||
}
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
xfree (sym_name);
|
||||
|
||||
/* Collect the next item from the iterator. If
|
||||
this is the last item, do not print the
|
||||
comma. */
|
||||
@ -736,7 +723,7 @@ enumerate_locals (PyObject *iter,
|
||||
while ((item = PyIter_Next (iter)))
|
||||
{
|
||||
const struct language_defn *language;
|
||||
char *sym_name;
|
||||
gdb::unique_xmalloc_ptr<char> sym_name;
|
||||
struct value *val;
|
||||
enum ext_lang_bt_status success = EXT_LANG_BT_ERROR;
|
||||
struct symbol *sym;
|
||||
@ -753,8 +740,6 @@ enumerate_locals (PyObject *iter,
|
||||
goto error;
|
||||
}
|
||||
|
||||
make_cleanup (xfree, sym_name);
|
||||
|
||||
success = extract_value (item, &val);
|
||||
if (success == EXT_LANG_BT_ERROR)
|
||||
{
|
||||
@ -801,7 +786,7 @@ enumerate_locals (PyObject *iter,
|
||||
ui_out_spaces (out, local_indent);
|
||||
}
|
||||
|
||||
ui_out_field_string (out, "name", sym_name);
|
||||
ui_out_field_string (out, "name", sym_name.get ());
|
||||
|
||||
if (! ui_out_is_mi_like_p (out))
|
||||
ui_out_text (out, " = ");
|
||||
@ -1033,6 +1018,7 @@ py_print_frame (PyObject *filter, int flags,
|
||||
struct value_print_options opts;
|
||||
PyObject *py_inf_frame;
|
||||
int print_level, print_frame_info, print_args, print_locals;
|
||||
gdb::unique_xmalloc_ptr<char> function_to_free;
|
||||
|
||||
/* Extract print settings from FLAGS. */
|
||||
print_level = (flags & PRINT_LEVEL) ? 1 : 0;
|
||||
@ -1205,17 +1191,15 @@ py_print_frame (PyObject *filter, int flags,
|
||||
|
||||
if (gdbpy_is_string (py_func))
|
||||
{
|
||||
char *function_to_free;
|
||||
function_to_free = python_string_to_host_string (py_func);
|
||||
|
||||
function = function_to_free =
|
||||
python_string_to_host_string (py_func);
|
||||
|
||||
if (function == NULL)
|
||||
if (function_to_free == NULL)
|
||||
{
|
||||
do_cleanups (cleanup_stack);
|
||||
return EXT_LANG_BT_ERROR;
|
||||
}
|
||||
make_cleanup (xfree, function_to_free);
|
||||
|
||||
function = function_to_free.get ();
|
||||
}
|
||||
else if (PyLong_Check (py_func))
|
||||
{
|
||||
@ -1302,7 +1286,8 @@ py_print_frame (PyObject *filter, int flags,
|
||||
|
||||
if (py_fn != Py_None)
|
||||
{
|
||||
char *filename = python_string_to_host_string (py_fn);
|
||||
gdb::unique_xmalloc_ptr<char>
|
||||
filename (python_string_to_host_string (py_fn));
|
||||
|
||||
if (filename == NULL)
|
||||
{
|
||||
@ -1310,13 +1295,12 @@ py_print_frame (PyObject *filter, int flags,
|
||||
return EXT_LANG_BT_ERROR;
|
||||
}
|
||||
|
||||
make_cleanup (xfree, filename);
|
||||
TRY
|
||||
{
|
||||
ui_out_wrap_hint (out, " ");
|
||||
ui_out_text (out, " at ");
|
||||
annotate_frame_source_file ();
|
||||
ui_out_field_string (out, "file", filename);
|
||||
ui_out_field_string (out, "file", filename.get ());
|
||||
annotate_frame_source_file_end ();
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ERROR)
|
||||
|
Reference in New Issue
Block a user