From d2b69f963aff4a0d6f99b379feb1024c06624bb6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 9 Jun 2017 18:39:30 +0200 Subject: [PATCH] VolumeWii: Don't set m_game_partition until we know partition is valid Without this, we can end up in an inconsistent state where m_game_partition is set to a partition that isn't in the partition maps. --- Source/Core/DiscIO/VolumeWii.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index 4b6ef56539..ceb1fa5788 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -65,14 +65,10 @@ VolumeWii::VolumeWii(std::unique_ptr reader) continue; const u64 partition_offset = static_cast(*read_buffer) << 2; - // Set m_game_partition if this is the game partition - if (m_game_partition == PARTITION_NONE) - { - const std::optional partition_type = - m_pReader->ReadSwapped(partition_table_offset + (i * 8) + 4); - if (partition_type == u32(0)) - m_game_partition = Partition(partition_offset); - } + // Check if this is the game partition + const bool is_game_partition = + m_game_partition == PARTITION_NONE && + m_pReader->ReadSwapped(partition_table_offset + (i * 8) + 4) == u32(0); // Read ticket std::vector ticket_buffer(sizeof(IOS::ES::Ticket)); @@ -113,6 +109,8 @@ VolumeWii::VolumeWii(std::unique_ptr reader) m_partition_keys[partition] = std::move(aes_context); m_partition_tickets[partition] = std::move(ticket); m_partition_tmds[partition] = std::move(tmd); + if (is_game_partition) + m_game_partition = partition; } } }