* 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.
This commit is contained in:
Keith Seitz 2012-11-10 20:25:56 +00:00
parent 0d63ecdad0
commit cf4ded82d0
3 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2012-11-10 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.
2012-11-10 Keith Seitz <keiths@redhat.com>
PR gdb/14288

View File

@ -11792,6 +11792,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

View File

@ -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);