Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 20:04:13 +08:00
Code Issues Projects Releases Wiki Activity

additional sanity checks to reduce false positives.

Browse Source
This commit is contained in:
morkt 2016-01-05 23:55:58 +04:00
parent d1e6ee4a35
commit 664f7ca415
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArcFormats/GSD/ArcGSP.cs
View File

@ -43,7 +43,7 @@ namespace GameRes.Formats.BlackRainbow
public override ArcFile TryOpen (ArcView file) public override ArcFile TryOpen (ArcView file)
{ {
int count = file.View.ReadInt32 (0); int count = file.View.ReadInt32 (0);
if (count <= 0 || count > 0x1ffff) if (!IsSaneCount (count))
return null; return null;
uint index_size = 0x40u * (uint)count; uint index_size = 0x40u * (uint)count;
if (index_size > file.View.Reserve (4, index_size)) if (index_size > file.View.Reserve (4, index_size))
@ -54,6 +54,8 @@ namespace GameRes.Formats.BlackRainbow
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
string name = file.View.ReadString (index_offset+8, 0x38); string name = file.View.ReadString (index_offset+8, 0x38);
if (0 == name.Length)
return null;
var entry = FormatCatalog.Instance.Create<Entry> (name); var entry = FormatCatalog.Instance.Create<Entry> (name);
entry.Offset = file.View.ReadUInt32 (index_offset); entry.Offset = file.View.ReadUInt32 (index_offset);
entry.Size = file.View.ReadUInt32 (index_offset+4); entry.Size = file.View.ReadUInt32 (index_offset+4);
@ -84,11 +86,13 @@ namespace GameRes.Formats.BlackRainbow
public override ArcFile TryOpen (ArcView file) public override ArcFile TryOpen (ArcView file)
{ {
int count = file.View.ReadInt32 (8); int count = file.View.ReadInt32 (8);
if (count <= 0 || count > 0x1ffff) if (!IsSaneCount (count))
return null; return null;
uint base_offset = file.View.ReadUInt32 (0x0c); uint base_offset = file.View.ReadUInt32 (0x0c);
uint index_offset = 0x10; uint index_offset = 0x10;
uint index_size = 4u * (uint)count; uint index_size = 4u * (uint)count;
if (base_offset >= file.MaxOffset || base_offset < (index_offset+index_size))
return null;
if (index_size > file.View.Reserve (index_offset, index_size)) if (index_size > file.View.Reserve (index_offset, index_size))
return null; return null;
var index = new List<uint> (count); var index = new List<uint> (count);

4
ArcFormats/Interheart/ArcFPK.cs
View File

@ -43,7 +43,7 @@ namespace GameRes.Formats.CandySoft
public override ArcFile TryOpen (ArcView file) public override ArcFile TryOpen (ArcView file)
{ {
int count = file.View.ReadInt32 (0); int count = file.View.ReadInt32 (0);
if (count <= 0 || count > 0xfffff) if (!IsSaneCount (count))
return null; return null;
List<Entry> dir = null; List<Entry> dir = null;
try try
@ -68,6 +68,8 @@ namespace GameRes.Formats.CandySoft
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
string name = file.View.ReadString (index_offset+8, (uint)name_size); string name = file.View.ReadString (index_offset+8, (uint)name_size);
if (0 == name.Length)
return null;
var entry = FormatCatalog.Instance.Create<Entry> (name); var entry = FormatCatalog.Instance.Create<Entry> (name);
entry.Offset = file.View.ReadUInt32 (index_offset); entry.Offset = file.View.ReadUInt32 (index_offset);
entry.Size = file.View.ReadUInt32 (index_offset+4); entry.Size = file.View.ReadUInt32 (index_offset+4);