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

(AbmFormat): additional sanity check.

Browse Source
This commit is contained in:
morkt
2016-08-18 14:49:58 +04:00
parent 6df62f37eb
commit 95e1dd97a6
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ArcFormats/Lilim/ImageABM.cs
View File

@@ -2,7 +2,7 @@
//! \date Tue Aug 04 22:58:17 2015 //! \date Tue Aug 04 22:58:17 2015
//! \brief LiLiM/Le.Chocolat compressed image format. //! \brief LiLiM/Le.Chocolat compressed image format.
// //
// Copyright (C) 2015 by morkt // Copyright (C) 2015-2016 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@@ -57,7 +57,7 @@ namespace GameRes.Formats.Lilim
else if (32 == type || 24 == type) else if (32 == type || 24 == type)
{ {
uint unpacked_size = LittleEndian.ToUInt32 (header, 2); uint unpacked_size = LittleEndian.ToUInt32 (header, 2);
if (unpacked_size == stream.Length) // probably an ordinary bmp file if (0 == unpacked_size || unpacked_size == stream.Length) // probably an ordinary bmp file
return null; return null;
frame_offset = LittleEndian.ToUInt32 (header, 0xA); frame_offset = LittleEndian.ToUInt32 (header, 0xA);
} }
@@ -77,11 +77,7 @@ namespace GameRes.Formats.Lilim
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (Stream stream, ImageMetaData info)
{ {
var meta = info as AbmImageData; using (var reader = new AbmReader (stream, (AbmImageData)info))
if (null == meta)
throw new ArgumentException ("AbmFormat.Read should be supplied with AbmMetaData", "info");
using (var reader = new AbmReader (stream, meta))
{ {
var pixels = reader.Unpack(); var pixels = reader.Unpack();
PixelFormat format = 32 == reader.BPP ? PixelFormats.Bgra32 : PixelFormats.Bgr24; PixelFormat format = 32 == reader.BPP ? PixelFormats.Bgra32 : PixelFormats.Bgr24;