aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2015-03-26 19:05:40 +0000
committerPedro Alves <palves@redhat.com>2015-04-01 15:18:41 +0100
commitde1fe8c8ab7f67856d9f2e2c5aa491cec01d3e85 (patch)
tree6651d366c0a4f4f16385da43056be7c75b5c0184
parente6f5c25b57546cbd88daccea4f1739c3f90f7560 (diff)
downloadgdb-de1fe8c8ab7f67856d9f2e2c5aa491cec01d3e85.zip
gdb-de1fe8c8ab7f67856d9f2e2c5aa491cec01d3e85.tar.gz
gdb-de1fe8c8ab7f67856d9f2e2c5aa491cec01d3e85.tar.bz2
keep_going: Add missing discard_cleanups call
By inspection, I noticed a path where we return without discarding the cleanups. gdb/ChangeLog: 2015-04-01 Pedro Alves <palves@redhat.com> * infrun.c (keep_going): Also discard cleanups if inserting breakpoints fails.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e1bd11..f5adaf8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2015-04-01 Pedro Alves <palves@redhat.com>
+ * infrun.c (keep_going): Also discard cleanups if inserting
+ breakpoints fails.
+
+2015-04-01 Pedro Alves <palves@redhat.com>
+
* infrun.c (wait_for_inferior): Install the
finish_thread_state_cleanup cleanup across the whole function, not
just around handle_inferior_event.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 18ce036..f366a57 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6251,6 +6251,7 @@ keep_going (struct execution_control_state *ecs)
{
exception_print (gdb_stderr, e);
stop_waiting (ecs);
+ discard_cleanups (old_cleanups);
return;
}
END_CATCH