Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2025-01-12 04:49:32 +08:00
Code Issues Projects Releases Wiki Activity

(Xp3Stream): fixed compressed segments reading.

Browse Source 
bug prevented decompression when compressed size was larger than
original.
This commit is contained in:
morkt 2015-12-07 00:00:47 +04:00
parent d462cf2269
commit 7916c171c1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ArcFormats/KiriKiri/ArcXP3.cs
View File

@ -673,7 +673,8 @@ NextEntry:
if (null != m_stream) if (null != m_stream)
m_stream.Dispose(); m_stream.Dispose();
var segment = m_segment.Current; var segment = m_segment.Current;
m_stream = m_file.CreateStream (segment.Offset, segment.Size); var segment_size = segment.IsCompressed ? segment.PackedSize : segment.Size;
m_stream = m_file.CreateStream (segment.Offset, segment_size);
if (segment.IsCompressed) if (segment.IsCompressed)
m_stream = new ZLibStream (m_stream, CompressionMode.Decompress); m_stream = new ZLibStream (m_stream, CompressionMode.Decompress);
} }
@ -684,11 +685,14 @@ NextEntry:
while (!m_eof && count > 0) while (!m_eof && count > 0)
{ {
int read = m_stream.Read (buffer, offset, count); int read = m_stream.Read (buffer, offset, count);
m_entry.Cipher.Decrypt (m_entry, m_offset, buffer, offset, read); if (0 != read)
m_offset += read; {
total += read; m_entry.Cipher.Decrypt (m_entry, m_offset, buffer, offset, read);
offset += read; m_offset += read;
count -= read; total += read;
offset += read;
count -= read;
}
if (0 != count) if (0 != count)
NextSegment(); NextSegment();
} }