ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3267 from JosJuice/0-byte-copytoemu 

Do nothing when calling CopyToEmu with a length of 0
This commit is contained in:
Pierre Bourdon 2015-11-17 22:04:49 +01:00
parent 24c7d23073 2005409229
commit fb87de83d4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,6 +253,9 @@ static inline bool ValidCopyRange(u32 address, size_t size)
void CopyFromEmu(void* data, u32 address, size_t size) void CopyFromEmu(void* data, u32 address, size_t size)
{ {
if (size == 0)
return;
if (!ValidCopyRange(address, size)) if (!ValidCopyRange(address, size))
{ {
PanicAlert("Invalid range in CopyFromEmu. %zx bytes from 0x%08x", size, address); PanicAlert("Invalid range in CopyFromEmu. %zx bytes from 0x%08x", size, address);
@ -263,6 +266,9 @@ void CopyFromEmu(void* data, u32 address, size_t size)
void CopyToEmu(u32 address, const void* data, size_t size) void CopyToEmu(u32 address, const void* data, size_t size)
{ {
if (size == 0)
return;
if (!ValidCopyRange(address, size)) if (!ValidCopyRange(address, size))
{ {
PanicAlert("Invalid range in CopyToEmu. %zx bytes to 0x%08x", size, address); PanicAlert("Invalid range in CopyToEmu. %zx bytes to 0x%08x", size, address);
@ -273,11 +279,12 @@ void CopyToEmu(u32 address, const void* data, size_t size)
void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength) void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength)
{ {
if (_iLength == 0)
return;
u8* ptr = GetPointer(_Address); u8* ptr = GetPointer(_Address);
if (ptr != nullptr) if (ptr != nullptr)
{ memset(ptr, _iValue, _iLength);
memset(ptr,_iValue,_iLength);
}
} }
std::string GetString(u32 em_address, size_t size) std::string GetString(u32 em_address, size_t size)