feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

Use correct mask for Fake VMem

Browse Source 
Shouldn't have any behaviour change for regular usage as both masks are 32MB
by default.
But fixes theoretical buffer overrun when memory size override is used.
This commit is contained in:
Scott Mansell
2021-05-23 05:46:25 +12:00
parent 77e5d79354
commit 610613ee76
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/PowerPC/MMU.cpp
View File

@@ -239,7 +239,7 @@ static T ReadFromHardware(u32 em_address)
if (Memory::m_pFakeVMEM && ((em_address & 0xFE000000) == 0x7E000000)) if (Memory::m_pFakeVMEM && ((em_address & 0xFE000000) == 0x7E000000))
{ {
T value; T value;
std::memcpy(&value, &Memory::m_pFakeVMEM[em_address & Memory::GetRamMask()], sizeof(T)); std::memcpy(&value, &Memory::m_pFakeVMEM[em_address & Memory::GetFakeVMemMask()], sizeof(T));
return bswap(value); return bswap(value);
} }
@@ -330,7 +330,8 @@ static void WriteToHardware(u32 em_address, const T data)
if (Memory::m_pFakeVMEM && ((em_address & 0xFE000000) == 0x7E000000)) if (Memory::m_pFakeVMEM && ((em_address & 0xFE000000) == 0x7E000000))
{ {
const T swapped_data = bswap(data); const T swapped_data = bswap(data);
std::memcpy(&Memory::m_pFakeVMEM[em_address & Memory::GetRamMask()], &swapped_data, sizeof(T)); std::memcpy(&Memory::m_pFakeVMEM[em_address & Memory::GetFakeVMemMask()], &swapped_data,
sizeof(T));
return; return;
} }