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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e1bd11a344b1070da8bb8cdaaff620d81ff5b27..f5adaf88cc67e8754e0b0de2002d566b6e43b629 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 18ce0361b7ee0bda2e1c37f1a03285a74e9f2786..f366a579c61fb498a12b3e90b91fdcbdf48466a3 100644 (file)
--- 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