Merge pull request #9050 from stblr/memory-watcher-fix

MemoryWatcher: Do not follow invalid pointers
dolphin-emu · Sep 1, 2020 · 6bd7687 · 6bd7687
2 parents 39a849a + ff16846
commit 6bd7687
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp
@@ -70,7 +70,11 @@ u32 MemoryWatcher::ChasePointer(const std::string& line)
 {
   u32 value = 0;
   for (u32 offset : m_addresses[line])
+  {
     value = Memory::Read_U32(value + offset);
+    if (!PowerPC::HostIsRAMAddress(value))
+      break;
+  }
   return value;
 }