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

Ensure that Volume::GetRegion doesn't return invalid enum values

Browse Source
This commit is contained in:
JosJuice
2017-07-16 14:52:17 +02:00
parent db1c534b3e
commit be8e93f472
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -61,7 +61,10 @@ std::string VolumeGC::GetGameID(const Partition& partition) const
Region VolumeGC::GetRegion() const Region VolumeGC::GetRegion() const
{ {
const std::optional<u32> region_code = ReadSwapped<u32>(0x458, PARTITION_NONE); const std::optional<u32> region_code = ReadSwapped<u32>(0x458, PARTITION_NONE);
return region_code ? static_cast<Region>(*region_code) : Region::UNKNOWN_REGION; if (!region_code)
return Region::UNKNOWN_REGION;
const Region region = static_cast<Region>(*region_code);
return region <= Region::PAL ? region : Region::UNKNOWN_REGION;
} }
Country VolumeGC::GetCountry(const Partition& partition) const Country VolumeGC::GetCountry(const Partition& partition) const

5
Source/Core/DiscIO/VolumeWii.cpp
View File

@ -233,7 +233,10 @@ std::string VolumeWii::GetGameID(const Partition& partition) const
Region VolumeWii::GetRegion() const Region VolumeWii::GetRegion() const
{ {
const std::optional<u32> region_code = m_pReader->ReadSwapped<u32>(0x4E000); const std::optional<u32> region_code = m_pReader->ReadSwapped<u32>(0x4E000);
return region_code ? static_cast<Region>(*region_code) : Region::UNKNOWN_REGION; if (!region_code)
return Region::UNKNOWN_REGION;
const Region region = static_cast<Region>(*region_code);
return region <= Region::NTSC_K ? region : Region::UNKNOWN_REGION;
} }
Country VolumeWii::GetCountry(const Partition& partition) const Country VolumeWii::GetCountry(const Partition& partition) const