Merge pull request #31 from cgohlke/patch-1

Make FLI image detection more stringent
This commit is contained in:
Alex Clark ☺ 2013-01-09 03:14:39 -08:00
commit 88a7672163

View File

@ -48,7 +48,9 @@ class FliImageFile(ImageFile.ImageFile):
# HEAD # HEAD
s = self.fp.read(128) s = self.fp.read(128)
magic = i16(s[4:6]) magic = i16(s[4:6])
if magic not in [0xAF11, 0xAF12]: if not (magic in [0xAF11, 0xAF12] and
i16(s[14:16]) in [0, 3] and # flags
s[20:22] == '\x00\x00'): # reserved
raise SyntaxError, "not an FLI/FLC file" raise SyntaxError, "not an FLI/FLC file"
# image characteristics # image characteristics