Debugger: Don't try to hash invalid RAM.

hrydgard · Dec 21, 2021 · 9017f91 · 9017f91
1 parent 293b5c0
commit 9017f91
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Core/Debugger/DisassemblyManager.cpp b/Core/Debugger/DisassemblyManager.cpp
@@ -88,10 +88,14 @@ bool IsLikelyStringAt(uint32_t addr) {
 
 static HashType computeHash(u32 address, u32 size)
 {
+	if (!Memory::IsValidAddress(address))
+		return 0;
+
+	size = Memory::ValidSize(address, size);
 #if PPSSPP_ARCH(AMD64)
-	return XXH3_64bits(Memory::GetPointer(address), size);
+	return XXH3_64bits(Memory::GetPointerUnchecked(address), size);
 #else
-	return XXH3_64bits(Memory::GetPointer(address), size) & 0xFFFFFFFF;
+	return XXH3_64bits(Memory::GetPointerUnchecked(address), size) & 0xFFFFFFFF;
 #endif
 }