diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-01-07 21:00:46 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-07 21:00:46 -0500 |
| commit | 72915423c3d4dedc9a168b0d8efdcc5ae46218d9 (patch) | |
| tree | 6197018feb7a644e529b837130f3a9776988ac15 | |
| parent | 91d96840ea698edaf5f2b6e8522d18f00bb18d9c (diff) | |
| parent | 693f6c54e5dfd73fa2ee51b576019621df1d722d (diff) | |
Merge pull request #441 from Kingcom/CallStack
Add check for valid address to call stack
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index bcc5d214..274c5ccc 100644 --- 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); |