summaryrefslogtreecommitdiff
path: root/gdb/printcmd.c
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2015-03-27 20:19:37 +0100
committerJan Kratochvil <jan.kratochvil@redhat.com>2015-03-27 20:19:37 +0100
commit1c4ff0802b0c4c8c820dcec503ffea024ea68f45 (patch)
treef431b79489053e21c1e2f05ccd9b478f4091fee4 /gdb/printcmd.c
parente04de5e3b55b9f481ff2b9939995301ba6b1c748 (diff)
Revert: Code cleanup: Move print_command_1 expr variable scope
Simon Marchi: I think this patch is wrong. Starting with that commit (f30d5c7), some tests (e.g. mi-break.exp) started to fail for me, because of gdb segfaulting. The address of expr is passed to the cleanup. When the cleanup is ran, expr is no longer in scope, so what is at that address is probably not safe to use anymore. That's my guess. gdb/ChangeLog 2015-03-27 Jan Kratochvil <jan.kratochvil@redhat.com> Revert: 2015-03-26 Jan Kratochvil <jan.kratochvil@redhat.com> Code cleanup. * printcmd.c (print_command_1): Move expr variable scope.
Diffstat (limited to 'gdb/printcmd.c')
-rw-r--r--gdb/printcmd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index a1451f8ab2..deb501ae7c 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -946,6 +946,7 @@ validate_format (struct format_data fmt, const char *cmdname)
static void
print_command_1 (const char *exp, int voidprint)
{
+ struct expression *expr;
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
char format = 0;
struct value *val;
@@ -968,8 +969,6 @@ print_command_1 (const char *exp, int voidprint)
if (exp && *exp)
{
- struct expression *expr;
-
expr = parse_expression (exp);
make_cleanup (free_current_contents, &expr);
val = evaluate_expression (expr);