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 #2512 from JosJuice/bnr-size-match 

VolumeGC: Check that opening.bnr size matches type
This commit is contained in:
Ryan Houdek 2015-06-07 23:20:54 -04:00
parent 51b440fbcf 78b6ed0218
commit a81d1c250a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,24 +296,24 @@ bool CVolumeGC::LoadBannerFile() const
file_system->ReadFile("opening.bnr", m_banner_file.data(), m_banner_file.size()); file_system->ReadFile("opening.bnr", m_banner_file.data(), m_banner_file.size());
u32 bannerSignature = *(u32*)m_banner_file.data(); u32 bannerSignature = *(u32*)m_banner_file.data();
switch (bannerSignature) if (file_size == BNR1_SIZE && bannerSignature == 0x31524e42) // "BNR1"
{ {
case 0x31524e42: // "BNR1"
m_banner_file_type = BANNER_BNR1; m_banner_file_type = BANNER_BNR1;
break; }
case 0x32524e42: // "BNR2" else if (file_size == BNR2_SIZE && bannerSignature == 0x32524e42) // "BNR2"
{
m_banner_file_type = BANNER_BNR2; m_banner_file_type = BANNER_BNR2;
break; }
default: else
{
m_banner_file_type = BANNER_INVALID; m_banner_file_type = BANNER_INVALID;
WARN_LOG(DISCIO, "Invalid opening.bnr type"); WARN_LOG(DISCIO, "Invalid opening.bnr. Type: %0x Size: %0lx", bannerSignature, (unsigned long)file_size);
break;
} }
} }
else else
{ {
m_banner_file_type = BANNER_INVALID; m_banner_file_type = BANNER_INVALID;
WARN_LOG(DISCIO, "Invalid opening.bnr size: %0lx", (unsigned long)file_size); WARN_LOG(DISCIO, "Invalid opening.bnr. Size: %0lx", (unsigned long)file_size);
} }
return m_banner_file_type != BANNER_INVALID; return m_banner_file_type != BANNER_INVALID;