[Lldb-commits] [lldb] r152630 - /lldb/trunk/source/Target/ThreadPlanStepOut.cpp

[Sean Callanan]

Author: spyffe
Date: Tue Mar 13 11:34:56 2012
New Revision: 152630

URL: http://llvm.org/viewvc/llvm-project?rev=152630&view=rev
Log:
Hardened the step-out plan in case it receives
bad stack IDs.

Modified:
    lldb/trunk/source/Target/ThreadPlanStepOut.cpp

Modified: lldb/trunk/source/Target/ThreadPlanStepOut.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepOut.cpp?rev=152630&r1=152629&r2=152630&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepOut.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepOut.cpp Tue Mar 13 11:34:56 2012
@@ -57,6 +57,9 @@
     StackFrameSP return_frame_sp (m_thread.GetStackFrameAtIndex(frame_idx + 1));
     StackFrameSP immediate_return_from_sp (m_thread.GetStackFrameAtIndex (frame_idx));
     
+    if (!return_frame_sp || !immediate_return_from_sp)
+        return; // we can't do anything here.  ValidatePlan() will return false.
+    
     m_step_out_to_id = return_frame_sp->GetStackID();
     m_immediate_step_from_id = immediate_return_from_sp->GetStackID();