mirror of
https://github.com/darlinghq/darling-gdb.git
synced 2024-11-28 06:20:30 +00:00
* 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.
This commit is contained in:
parent
8c5630cb08
commit
02357a4aaf
@ -1,3 +1,10 @@
|
||||
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.
|
||||
|
||||
2010-05-05 Michael Snyder <msnyder@vmware.com>
|
||||
|
||||
* c-exp.y (parse_string_or_char): Delete unused variable.
|
||||
|
27
gdb/remote.c
27
gdb/remote.c
@ -2482,6 +2482,21 @@ const struct gdb_xml_element threads_elements[] = {
|
||||
{ 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 *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 *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);
|
||||
|
Loading…
Reference in New Issue
Block a user