[RFA] remote.c, clean-up mix-up
Pedro Alves
pedro@codesourcery.com
Thu May 6 00:18:00 GMT 2010
On Thursday 06 May 2010 00:44:35, Pedro Alves wrote:
> Here's what I'm testing.
No regressions against x86_64-linux gdbserver.
> 2010-05-05 Pedro Alves <pedro@codesourcery.com>
>
> * remote.c (clear_threads_parsing_context): New.
> (remote_threads_info): Delele unused null_cleanup. Install a
> cleanup to clear the threads_parsing_context in case parsing
> throws.
Applied as below with a little comment added and typo in
changelog fixed.
--
Pedro Alves
2010-05-06 Pedro Alves <pedro@codesourcery.com>
* remote.c (clear_threads_parsing_context): New.
(remote_threads_info): Delete unused null_cleanup. Install a
cleanup to clear the threads_parsing_context in case parsing
throws.
---
gdb/remote.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
Index: src/gdb/remote.c
===================================================================
--- src.orig/gdb/remote.c 2010-05-06 01:01:56.000000000 +0100
+++ src/gdb/remote.c 2010-05-06 01:10:47.000000000 +0100
@@ -2482,6 +2482,21 @@ const struct gdb_xml_element threads_ele
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
+/* Discard the contents of the constructed thread info context. */
+
+static void
+clear_threads_parsing_context (void *p)
+{
+ struct threads_parsing_context *context = p;
+ int i;
+ struct thread_item *item;
+
+ for (i = 0; VEC_iterate (thread_item_t, context->items, i, item); ++i)
+ xfree (item->extra);
+
+ VEC_free (thread_item_t, context->items);
+}
+
#endif
/*
@@ -2512,15 +2527,20 @@ remote_threads_info (struct target_ops *
{
struct gdb_xml_parser *parser;
struct threads_parsing_context context;
- struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
+ struct cleanup *clear_parsing_context;
context.items = 0;
+ /* Note: this parser cleanup is already guarded by BACK_TO
+ above. */
parser = gdb_xml_create_parser_and_cleanup (_("threads"),
threads_elements,
&context);
gdb_xml_use_dtd (parser, "threads.dtd");
+ clear_parsing_context
+ = make_cleanup (clear_threads_parsing_context, &context);
+
if (gdb_xml_parse (parser, xml) == 0)
{
int i;
@@ -2542,13 +2562,12 @@ remote_threads_info (struct target_ops *
info = demand_private_info (item->ptid);
info->core = item->core;
info->extra = item->extra;
- item->extra = 0;
+ item->extra = NULL;
}
- xfree (item->extra);
}
}
- VEC_free (thread_item_t, context.items);
+ do_cleanups (clear_parsing_context);
}
do_cleanups (back_to);
More information about the Gdb-patches
mailing list