Merge pull request #441 from Kingcom/CallStack

Add check for valid address to call stack
2015-01-07 21:00:46 -05:00 · 2015-01-07 21:00:46 -05:00 · 72915423c3
parent 91d96840ea 693f6c54e5
commit 72915423c3
1 changed files with 3 additions and 0 deletions
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@ -38,6 +38,9 @@ void CallstackWidget::OnCPUStepped()
    {
        ret_addr = Memory::Read32(addr);
        call_addr = ret_addr - 4; //get call address???
+        
+        if (Memory::GetPointer(call_addr) == nullptr)
+            break;

        /* TODO (mattvail) clean me, move to debugger interface */
        u32 insn = Memory::Read32(call_addr);