This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA] Fix two memory leaks
- From: Keith Seitz <keiths at redhat dot com>
- To: "gdb-patches at sourceware dot org ml" <gdb-patches at sourceware dot org>
- Date: Tue, 23 Oct 2012 14:21:56 -0700
- Subject: [RFA] Fix two memory leaks
Hi,
While testing some recent work, I noticed that valgrind was reporting
two memory leaks related to linespec parsing/SaL resolution.
The following patch fixes both leaks.
Keith
ChangeLog
2012-10-23 Keith Seitz <keiths@redhat.com>
* breakpoint.c (clear_command): Add cleanup for
sals.sals if an argument is given.
* linespec.c (parse_linespec): Do cleanups after
parsing a convenience variable.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 8eeeacf..8b6b635 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -11788,6 +11788,7 @@ clear_command (char *arg, int from_tty)
sals = decode_line_with_current_source (arg,
(DECODE_LINE_FUNFIRSTLINE
| DECODE_LINE_LIST_MODE));
+ make_cleanup (xfree, sals.sals);
default_match = 0;
}
else
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 06634d2..e9918b1 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -2095,20 +2095,17 @@ parse_linespec (linespec_parser *parser, char **argptr)
cleanup = make_cleanup (xfree, var);
PARSER_RESULT (parser)->line_offset
= linespec_parse_variable (PARSER_STATE (parser), var);
+ do_cleanups (cleanup);
/* If a line_offset wasn't found (VAR is the name of a user
variable/function), then skip to normal symbol processing. */
if (PARSER_RESULT (parser)->line_offset.sign != LINE_OFFSET_UNKNOWN)
{
- discard_cleanups (cleanup);
-
/* Consume this token. */
linespec_lexer_consume_token (parser);
goto convert_to_sals;
}
-
- do_cleanups (cleanup);
}
else if (token.type != LSTOKEN_STRING && token.type != LSTOKEN_NUMBER)
unexpected_linespec_error (parser);