diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-04-04 21:08:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-04 21:08:53 +0200 |
| commit | 0aa92f7a5654f42811120cf3b140dd5bb4c25abc (patch) | |
| tree | c3d8d9cf43ab19e7c6fc4f268732025783eccc5e /Source/Core | |
| parent | 4421cc471d4d61c2e5ded49497b58651e7f65351 (diff) | |
| parent | fad57b648f61e4a393c4e59b7a80335533b9364d (diff) | |
Merge pull request #12685 from JosJuice/get-pointer-for-range-zero-size
Memmap: Don't show panic alert for 0 length range
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/Memmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index 02d31c8272..ca17b5db80 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -409,7 +409,7 @@ u8* MemoryManager::GetPointerForRange(u32 address, size_t size) const // Check that the beginning and end of the range are valid u8* pointer = GetPointer(address); - if (!pointer || !GetPointer(address + u32(size) - 1)) + if (pointer == nullptr || (size != 0 && GetPointer(address + u32(size) - 1) == nullptr)) { // A panic alert has already been raised by GetPointer return nullptr; |