Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-10-23 07:38:16 +08:00
Code Issues Projects Releases Wiki Activity

(BmpFormat.ReadMetaData): some fault-tolerance.

Browse Source
This commit is contained in:
morkt 2016-08-18 14:59:17 +04:00
parent 79f8548d3e
commit 8808b54c88
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GameRes/ImageBMP.cs
View File

@ -110,13 +110,18 @@ namespace GameRes
{ {
int c1 = stream.ReadByte(); int c1 = stream.ReadByte();
int c2 = stream.ReadByte(); int c2 = stream.ReadByte();
if (0x42 != c1 || 0x4d != c2) if ('B' != c1 || 'M' != c2)
return null; return null;
using (var file = new ArcView.Reader (stream)) using (var file = new ArcView.Reader (stream))
{ {
uint size = file.ReadUInt32(); uint size = file.ReadUInt32();
if (size < 14+40) if (size < 14+40)
return null; {
// some otherwise valid bitmaps have size field set to zero
if (size != 0 || !stream.CanSeek)
return null;
size = (uint)stream.Length;
}
SkipBytes (file, 8); SkipBytes (file, 8);
uint header_size = file.ReadUInt32(); uint header_size = file.ReadUInt32();
if (header_size < 40 || size-14 < header_size) if (header_size < 40 || size-14 < header_size)