diff options
| author | skidau <skidau@gmail.com> | 2015-07-14 10:56:12 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-07-14 10:56:12 +1000 |
| commit | a12a4520d8b677c160108a8e8ce93d8c937219d7 (patch) | |
| tree | 63f871459df280112f481359444786f3b341a9e6 /Source/Core/DiscIO/DiscScrubber.cpp | |
| parent | dc25277a2f0fb175b865ed1cd87fecc83ae1e5d0 (diff) | |
| parent | 64bd20aba72f2dfa4d61041f825c389401b8ae0c (diff) | |
Merge pull request #2684 from TraceBullet/master
DiscIO: Check if m_Disc is null in ParsePartitionData()
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DiscScrubber.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index e44195492b..10d0c0e417 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -265,8 +265,14 @@ bool ParsePartitionData(SPartition& _rPartition) // Ready some stuff m_Disc = CreateVolumeFromFilename(m_Filename, _rPartition.GroupNumber, _rPartition.Number); - std::unique_ptr<IFileSystem> filesystem(CreateFileSystem(m_Disc)); + if (m_Disc == nullptr) + { + ERROR_LOG(DISCIO, "Failed to create volume from file %s", m_Filename.c_str()); + m_Disc = OldVolume; + return false; + } + std::unique_ptr<IFileSystem> filesystem(CreateFileSystem(m_Disc)); if (!filesystem) { ERROR_LOG(DISCIO, "Failed to create filesystem for group %d partition %u", _rPartition.GroupNumber, _rPartition.Number); |