Merge pull request #15247 from unknownbrackets/debugger-hash

Debugger: Don't try to hash invalid RAM
This commit is contained in:
Henrik Rydgård 2021-12-21 08:29:37 +01:00 committed by GitHub
commit cc767622d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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
}