Index: gdb/frame.c
===================================================================
RCS file: /cvs/src/src/gdb/frame.c,v
retrieving revision 1.304
diff -u -p -r1.304 frame.c
--- gdb/frame.c	4 Jan 2012 08:17:02 -0000	1.304
+++ gdb/frame.c	14 Feb 2012 20:43:07 -0000
@@ -2096,6 +2096,8 @@ find_frame_sal (struct frame_info *frame
 	   we can't do much better.  */
 	sal->pc = get_frame_pc (frame);
 
+      sal->pspace = get_frame_program_space (frame);
+
       return;
     }
 
Index: gdb/stack.c
===================================================================
RCS file: /cvs/src/src/gdb/stack.c,v
retrieving revision 1.247
diff -u -p -r1.247 stack.c
--- gdb/stack.c	7 Feb 2012 04:48:22 -0000	1.247
+++ gdb/stack.c	14 Feb 2012 20:43:08 -0000
@@ -909,6 +909,11 @@ set_last_displayed_sal (int valid, struc
   last_displayed_addr = addr;
   last_displayed_symtab = symtab;
   last_displayed_line = line;
+  if (valid && pspace == NULL)
+    {
+      warning (_("Trying to set NULL pspace."));
+      clear_last_displayed_sal ();
+    }
 }
 
 /* Forget the last sal we displayed.  */