piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Memmap: More error checking for Memset

Browse Source 
It now uses the same error checking as CopyFromEmu and CopyToEmu.
This commit is contained in:
JosJuice
2015-11-27 17:13:47 +01:00
parent 5a1729877e
commit 2e3735b772
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/Memmap.cpp
View File

@ -282,9 +282,12 @@ void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength)
if (_iLength == 0) if (_iLength == 0)
return; return;
u8* ptr = GetPointer(_Address); if (!ValidCopyRange(_Address, _iLength))
if (ptr != nullptr) {
memset(ptr, _iValue, _iLength); PanicAlert("Invalid range in Memset. %zx bytes at 0x%08x", _iLength, _Address);
return;
}
memset(GetPointer(_Address), _iValue, _iLength);
} }
std::string GetString(u32 em_address, size_t size) std::string GetString(u32 em_address, size_t size)