piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core/AddressSpace: Return null accessors when no game is running to prevent out-of-bounds memory accesses.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2020-12-13 06:08:45 +01:00
parent d312495934
commit 668b8d60c8
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/AddressSpace.cpp
View File

@ -374,9 +374,13 @@ static SmallBlockAccessors s_fake_address_space_accessors;
static CompositeAddressSpaceAccessors s_physical_address_space_accessors_gcn;
static CompositeAddressSpaceAccessors s_physical_address_space_accessors_wii;
static NullAccessors s_null_accessors;
static bool s_initialized = false;
Accessors* GetAccessors(Type address_space)
{
if (!s_initialized)
return &s_null_accessors;
// default to effective
switch (address_space)
{
@ -420,6 +424,12 @@ void Init()
s_physical_address_space_accessors_gcn = {{0x00000000, &s_mem1_address_space_accessors}};
s_physical_address_space_accessors_wii = {{0x00000000, &s_mem1_address_space_accessors},
{0x10000000, &s_mem2_address_space_accessors}};
s_initialized = true;
}
void Shutdown()
{
s_initialized = false;
}
} // namespace AddressSpace

1
Source/Core/Core/HW/AddressSpace.h
View File

@ -48,5 +48,6 @@ struct Accessors
Accessors* GetAccessors(Type address_space);
void Init();
void Shutdown();
} // namespace AddressSpace

1
Source/Core/Core/HW/HW.cpp
View File

@ -70,6 +70,7 @@ void Shutdown()
CPU::Shutdown();
DVDInterface::Shutdown();
DSP::Shutdown();
AddressSpace::Shutdown();
Memory::Shutdown();
ExpansionInterface::Shutdown();
SerialInterface::Shutdown();