1 files changed, 3 insertions, 0 deletions
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 8dfa4fd..06def78 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1652,6 +1652,9 @@ finish_forward (struct symbol *function, struct frame_info *frame)
 					 get_stack_frame_id (frame),
                                          bp_finish);
 
+  /* set_momentary_breakpoint invalidates FRAME.  */
+  frame = NULL;
+
   old_chain = make_cleanup_delete_breakpoint (breakpoint);
 
   set_longjmp_breakpoint (tp, frame_id);