cosmetic changes.

This commit is contained in:
morkt
2014-08-31 18:49:42 +04:00
parent f06396f1e3
commit 06e651d43b
5 changed files with 16 additions and 14 deletions

View File

@@ -104,7 +104,7 @@ namespace GameRes.Formats.KiriKiri
return null;
dir_offset = file.View.ReadInt64 (0x20);
}
if (dir_offset >= file.MaxOffset)
if (dir_offset < 0x13 || dir_offset >= file.MaxOffset)
return null;
int header_type = file.View.ReadByte (dir_offset);
@@ -588,7 +588,7 @@ NextEntry:
long m_offset = 0;
bool m_eof = false;
public override bool CanRead { get { return true; } }
public override bool CanRead { get { return m_stream != null; } }
public override bool CanSeek { get { return false; } }
public override bool CanWrite { get { return false; } }
public override long Length { get { return m_entry.UnpackedSize; } }
@@ -616,11 +616,9 @@ NextEntry:
if (null != m_stream)
m_stream.Dispose();
var segment = m_segment.Current;
m_stream = m_file.CreateStream (segment.Offset, segment.Size);
if (segment.IsCompressed)
m_stream = new ZLibStream (m_file.CreateStream (segment.Offset, segment.PackedSize),
CompressionMode.Decompress);
else
m_stream = m_file.CreateStream (segment.Offset, segment.Size);
m_stream = new ZLibStream (m_stream, CompressionMode.Decompress);
}
public override int Read (byte[] buffer, int offset, int count)