Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2025-01-11 20:39:29 +08:00
Code Issues Projects Releases Wiki Activity

(BinOpener): adjusted sanity checks.

Browse Source
This commit is contained in:
morkt 2016-01-17 23:34:37 +04:00
parent dc95bd18d4
commit a8491dcbfc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArcFormats/Xuse/ArcBIN.cs
View File

@ -46,22 +46,24 @@ namespace GameRes.Formats.Xuse
public override ArcFile TryOpen (ArcView file) public override ArcFile TryOpen (ArcView file)
{ {
long first_offset = file.View.ReadInt64 (8); var first_offset = file.View.ReadUInt32 (8);
if (first_offset <= 0x14 || first_offset >= file.MaxOffset || first_offset > int.MaxValue) if (first_offset <= 0x14 || first_offset >= file.MaxOffset || first_offset > int.MaxValue)
return null; return null;
var count = (int)(first_offset - 4) / 0x10; int index_size = (int)(first_offset - 4);
if (count != 0x100) var count = index_size / 0x10;
if (count * 0x10 != index_size)
return null; return null;
string base_name = Path.GetFileNameWithoutExtension (file.Name); string base_name = Path.GetFileNameWithoutExtension (file.Name);
uint index_offset = 4; uint index_offset = 4;
uint last_offset = 0;
var dir = new List<Entry> (count); var dir = new List<Entry> (count);
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
var offset = file.View.ReadInt64 (index_offset+4); var offset = file.View.ReadUInt32 (index_offset+4);
if (0 == offset) if (0 == offset)
break; break;
if (offset < first_offset) if (offset <= last_offset)
return null; return null;
string name = string.Format ("{0}#{1:D4}", base_name, i); string name = string.Format ("{0}#{1:D4}", base_name, i);
var entry = new AutoEntry (name, () => { var entry = new AutoEntry (name, () => {
@ -74,6 +76,7 @@ namespace GameRes.Formats.Xuse
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
return null; return null;
dir.Add (entry); dir.Add (entry);
last_offset = offset;
index_offset += 0x10; index_offset += 0x10;
} }
if (0 == dir.Count) if (0 == dir.Count)