From 7a630bc2f99fcd55ddd83274574531d526ca1925 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 23 Apr 2017 11:23:43 -0600 Subject: [PATCH] Avoid manual resource management in py-framefilter.c This patch removes the last bit of manual resource management from py-framefilter.c. This will be useful in the next patch. gdb/ChangeLog 2018-03-26 Tom Tromey * python/py-framefilter.c (enumerate_args): Use gdb::unique_xmalloc_ptr. --- gdb/ChangeLog | 5 +++++ gdb/python/py-framefilter.c | 20 +++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ed5d5bedcb1..5cc8d9ef9c5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-03-26 Tom Tromey + + * python/py-framefilter.c (enumerate_args): Use + gdb::unique_xmalloc_ptr. + 2018-03-26 Tom Tromey * python/py-framefilter.c (py_print_frame): Return diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 1dc15ae14e4..dcac42df8ec 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -560,6 +560,9 @@ enumerate_args (PyObject *iter, } END_CATCH + gdb::unique_xmalloc_ptr arg_holder (arg.error); + gdb::unique_xmalloc_ptr entry_holder (entryarg.error); + /* The object has not provided a value, so this is a frame argument to be read by GDB. In this case we have to account for entry-values. */ @@ -571,11 +574,7 @@ enumerate_args (PyObject *iter, args_type, print_args_field, NULL) == EXT_LANG_BT_ERROR) - { - xfree (arg.error); - xfree (entryarg.error); - return EXT_LANG_BT_ERROR; - } + return EXT_LANG_BT_ERROR; } if (entryarg.entry_kind != print_entry_values_no) @@ -589,8 +588,6 @@ enumerate_args (PyObject *iter, } CATCH (except, RETURN_MASK_ALL) { - xfree (arg.error); - xfree (entryarg.error); gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; } @@ -600,15 +597,8 @@ enumerate_args (PyObject *iter, if (py_print_single_arg (out, NULL, &entryarg, NULL, &opts, args_type, print_args_field, NULL) == EXT_LANG_BT_ERROR) - { - xfree (arg.error); - xfree (entryarg.error); - return EXT_LANG_BT_ERROR; - } + return EXT_LANG_BT_ERROR; } - - xfree (arg.error); - xfree (entryarg.error); } else { -- 2.30.2