From 297b790e4f14be284df39d5ac67e59527df41e29 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 13 Jan 2020 22:08:44 +0100 Subject: DiscIO: Add out of bounds checks for blob reading --- Source/Core/DiscIO/DirectoryBlob.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Source/Core/DiscIO/DirectoryBlob.cpp') diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index 723133fd8b..514fdc7c44 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -375,6 +375,9 @@ DirectoryBlobReader::DirectoryBlobReader(const std::string& game_partition_root, bool DirectoryBlobReader::Read(u64 offset, u64 length, u8* buffer) { + if (offset + length > m_data_size) + return false; + // TODO: We don't handle raw access to the encrypted area of Wii discs correctly. return (m_is_wii ? m_nonpartition_contents : m_gamecube_pseudopartition.GetContents()) .Read(offset, length, buffer); @@ -394,6 +397,9 @@ bool DirectoryBlobReader::ReadWiiDecrypted(u64 offset, u64 size, u8* buffer, u64 if (it == m_partitions.end()) return false; + if (offset + size > it->second.GetDataSize()) + return false; + return it->second.GetContents().Read(offset, size, buffer); } -- cgit v1.2.3