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

Check file system validity before reading opening.bnr 

This happened to work without any problems because the only way for a
file system to be invalid was to not have the right GC/Wii magic word
in the unencrypted area, and a volume could not be created without
having the right GC/Wii magic word there. Now that file systems read
the magic word from a partition instead, a fix is needed.
This commit is contained in:
JosJuice 2015-06-03 13:19:28 +02:00
parent 639ce6c484
commit 2bcad57225
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,8 +193,10 @@ void CVolumeGC::LoadBannerFile() const
GCBanner banner_file; GCBanner banner_file;
std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this, PARTITION_NONE)); std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this, PARTITION_NONE));
size_t file_size = static_cast<size_t>(file_system->GetFileSize("opening.bnr")); if (!file_system)
return;
size_t file_size = static_cast<size_t>(file_system->GetFileSize("opening.bnr"));
constexpr int BNR1_MAGIC = 0x31524e42; constexpr int BNR1_MAGIC = 0x31524e42;
constexpr int BNR2_MAGIC = 0x32524e42; constexpr int BNR2_MAGIC = 0x32524e42;
if (file_size != BNR1_SIZE && file_size != BNR2_SIZE) if (file_size != BNR1_SIZE && file_size != BNR2_SIZE)

3
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -299,6 +299,9 @@ std::string CVolumeWiiCrypted::GetInternalName(const Partition& partition) const
std::map<Language, std::string> CVolumeWiiCrypted::GetLongNames() const std::map<Language, std::string> CVolumeWiiCrypted::GetLongNames() const
{ {
std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this, GetGamePartition())); std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this, GetGamePartition()));
if (!file_system)
return {{}};
std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES); std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES);
size_t size = file_system->ReadFile("opening.bnr", opening_bnr.data(), opening_bnr.size(), 0x5C); size_t size = file_system->ReadFile("opening.bnr", opening_bnr.data(), opening_bnr.size(), 0x5C);
opening_bnr.resize(size); opening_bnr.resize(size);