lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(MrgOpener): check if index size is too small.

Browse Source
This commit is contained in:
morkt
2015-07-15 06:41:19 +04:00
parent f4e15de73b
commit 2a3c4fb005
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ArcFormats/ArcMRG.cs
View File

@@ -61,7 +61,7 @@ namespace GameRes.Formats.FC01
if (key2index != 0 && key1index == 0) if (key2index != 0 && key1index == 0)
return null; return null;
uint index_size = file.View.ReadUInt32 (8) - 0x10; uint index_size = file.View.ReadUInt32 (8) - 0x10;
if (0 == index_size || index_size >= file.MaxOffset) if (index_size < 0x40 || index_size >= file.MaxOffset)
return null; return null;
var index = new byte[index_size]; var index = new byte[index_size];
if (index.Length != file.View.Read (0x10, index, 0, index_size)) if (index.Length != file.View.Read (0x10, index, 0, index_size))
@@ -150,19 +150,19 @@ namespace GameRes.Formats.FC01
int remaining = 1; int remaining = 1;
uint last_offset = (byte)(v ^ key); uint last_offset = (byte)(v ^ key);
key -= (byte)++remaining;
for (int i = index.Length-2; i >= index.Length-4; --i) for (int i = index.Length-2; i >= index.Length-4; --i)
{ {
key -= (byte)++remaining;
v = index[i]; v = index[i];
v = (byte)(v << 1 | v >> 7); v = (byte)(v << 1 | v >> 7);
last_offset = (last_offset << 8) | (uint)(v ^ key); last_offset = (last_offset << 8) | (uint)(v ^ key);
key -= (byte)++remaining;
} }
if (last_offset != actual_offset) if (last_offset != actual_offset)
return null; return null;
while (remaining < index.Length) while (++remaining < index.Length)
key -= (byte)++remaining; key -= (byte)remaining;
return key; return key;
} }
} }