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

(ArcOpener): ignore parse errors in case of incorrect filename length.

Browse Source
This commit is contained in:
morkt 2016-06-06 21:20:34 +04:00
parent a3e2aa5848
commit 7133aa5ea8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ArcFormats/Will/ArcWILL.cs
View File

@ -29,6 +29,7 @@ using System.ComponentModel.Composition;
using System.IO; using System.IO;
using GameRes.Formats.Properties; using GameRes.Formats.Properties;
using GameRes.Formats.Strings; using GameRes.Formats.Strings;
using GameRes.Utility;
namespace GameRes.Formats.Will namespace GameRes.Formats.Will
{ {
@ -69,6 +70,8 @@ namespace GameRes.Formats.Will
for (int i = 0; i < ext_count; ++i) for (int i = 0; i < ext_count; ++i)
{ {
string ext = file.View.ReadString (dir_offset, 4).ToLowerInvariant(); string ext = file.View.ReadString (dir_offset, 4).ToLowerInvariant();
if (0 == ext.Length)
return null;
int count = file.View.ReadInt32 (dir_offset+4); int count = file.View.ReadInt32 (dir_offset+4);
uint offset = file.View.ReadUInt32 (dir_offset+8); uint offset = file.View.ReadUInt32 (dir_offset+8);
if (count <= 0 || count > 0xffff || offset <= dir_offset || offset > file.MaxOffset) if (count <= 0 || count > 0xffff || offset <= dir_offset || offset > file.MaxOffset)
@ -76,7 +79,12 @@ namespace GameRes.Formats.Will
ext_list.Add (new ExtRecord { Extension = ext, FileCount = count, DirOffset = offset }); ext_list.Add (new ExtRecord { Extension = ext, FileCount = count, DirOffset = offset });
dir_offset += 12; dir_offset += 12;
} }
var dir = ReadFileList (file, ext_list, 9); List<Entry> dir = null;
try
{
dir = ReadFileList (file, ext_list, 9);
}
catch { /* ignore parse errors */ }
if (null == dir) if (null == dir)
dir = ReadFileList (file, ext_list, 13); dir = ReadFileList (file, ext_list, 13);
if (null == dir) if (null == dir)
@ -122,8 +130,7 @@ namespace GameRes.Formats.Will
{ {
for (int i = 0; i < data.Length; ++i) for (int i = 0; i < data.Length; ++i)
{ {
byte v = data[i]; data[i] = Binary.RotByteR (data[i], 2);
data[i] = (byte)(v >> 2 | v << 6);
} }
} }
@ -131,8 +138,7 @@ namespace GameRes.Formats.Will
{ {
for (int i = 0; i < data.Length; ++i) for (int i = 0; i < data.Length; ++i)
{ {
byte v = data[i]; data[i] = Binary.RotByteL (data[i], 2);
data[i] = (byte)(v << 2 | v >> 6);
} }
} }