piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

RVZ: Fix split seed reads

Browse Source 
This could cause read errors if chunks were laid out a certain
way in the file and the whole chunk wasn't being read at once.
Should fix https://bugs.dolphin-emu.org/issues/12184.
This commit is contained in:
JosJuice
2020-07-11 17:27:19 +02:00
parent 5286fb2657
commit f7c32bc04e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DiscIO/WIACompression.cpp
View File

@ -350,13 +350,11 @@ bool RVZPackDecompressor::Decompress(const DecompressionBuffer& in, Decompressio
if (result) if (result)
return *result; return *result;
m_size = Common::swap32(m_decompressed.data.data() + m_decompressed_bytes_read); const u32 size = Common::swap32(m_decompressed.data.data() + m_decompressed_bytes_read);
m_junk = m_size & 0x80000000; m_junk = size & 0x80000000;
if (m_junk) if (m_junk)
{ {
m_size &= 0x7FFFFFFF;
constexpr size_t SEED_SIZE = LaggedFibonacciGenerator::SEED_SIZE * sizeof(u32); constexpr size_t SEED_SIZE = LaggedFibonacciGenerator::SEED_SIZE * sizeof(u32);
constexpr size_t BLOCK_SIZE = 0x8000; constexpr size_t BLOCK_SIZE = 0x8000;
@ -372,6 +370,7 @@ bool RVZPackDecompressor::Decompress(const DecompressionBuffer& in, Decompressio
} }
m_decompressed_bytes_read += sizeof(u32); m_decompressed_bytes_read += sizeof(u32);
m_size = size & 0x7FFFFFFF;
} }
size_t bytes_to_write = std::min<size_t>(m_size, out->data.size() - out->bytes_written); size_t bytes_to_write = std::min<size_t>(m_size, out->data.size() - out->bytes_written);