From 8471ec3d566da2087e09192dd0fd0dc0f08ceee8 Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Sat, 13 Aug 2016 21:17:41 -0400
Subject: [PATCH] libdebugger: Fix #12913.

ThreadHandler:
- When single stepping, verify that current instruction pointer is
  actually within a valid image. Otherwise we'll crash attempting to
  retrieve debug information for it.
---
 src/kits/debugger/controllers/ThreadHandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/kits/debugger/controllers/ThreadHandler.cpp b/src/kits/debugger/controllers/ThreadHandler.cpp
index a25bdc5830..33d6b7b931 100644
--- a/src/kits/debugger/controllers/ThreadHandler.cpp
+++ b/src/kits/debugger/controllers/ThreadHandler.cpp
@@ -826,6 +826,9 @@ ThreadHandler::_HandleSingleStepStep(CpuState* cpuState)
 			if (stackTrace != NULL) {
 				StackFrame* frame = stackTrace->FrameAt(0);
 				Image* image = frame->GetImage();
+				if (image == NULL)
+					return false;
+
 				ImageDebugInfo* info = NULL;
 				if (GetImageDebugInfo(image, info) != B_OK)
 					return false;