[haiku-commits] haiku: hrev50487 - src/kits/debugger/controllers

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 14 Aug 2016 03:24:38 +0200 (CEST)

hrev50487 adds 1 changeset to branch 'master'
old head: b7012e6c465fe907aef98a53af2c2e73e11524f0
new head: 8471ec3d566da2087e09192dd0fd0dc0f08ceee8
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=8471ec3d566d+%5Eb7012e6c465f

----------------------------------------------------------------------------

8471ec3d566d: 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.

                                         [ Rene Gollent <rene@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev50487
Commit:      8471ec3d566da2087e09192dd0fd0dc0f08ceee8
URL:         http://cgit.haiku-os.org/haiku/commit/?id=8471ec3d566d
Author:      Rene Gollent <rene@xxxxxxxxxxx>
Date:        Sun Aug 14 01:17:41 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/12913

----------------------------------------------------------------------------

1 file changed, 3 insertions(+)
src/kits/debugger/controllers/ThreadHandler.cpp | 3 +++

----------------------------------------------------------------------------

diff --git a/src/kits/debugger/controllers/ThreadHandler.cpp 
b/src/kits/debugger/controllers/ThreadHandler.cpp
index a25bdc5..33d6b7b 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;


Other related posts:

  • » [haiku-commits] haiku: hrev50487 - src/kits/debugger/controllers - anevilyak