summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/VolumeGC.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2015-06-03 13:19:28 +0200
committerJosJuice <josjuice@gmail.com>2017-05-16 22:59:01 +0200
commit2bcad57225b9b0a4635d62eeabbbb138d71386bf (patch)
treebd1376e2ebbbed58f1b75a73956aaf81d56812e6 /Source/Core/DiscIO/VolumeGC.cpp
parent639ce6c484c58c577c978eb9eda08e7800e959b1 (diff)
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.
Diffstat (limited to 'Source/Core/DiscIO/VolumeGC.cpp')
-rw-r--r--Source/Core/DiscIO/VolumeGC.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 6f7568a3a1..d6abd08263 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -193,8 +193,10 @@ void CVolumeGC::LoadBannerFile() const
GCBanner banner_file;
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 BNR2_MAGIC = 0x32524e42;
if (file_size != BNR1_SIZE && file_size != BNR2_SIZE)