python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-01 02:13:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Catch truncated DDS files

Browse Source
This commit is contained in:
wiredfool 2016-01-15 21:34:36 +00:00
parent 18d48dc665
commit b0d15c9b8d
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PIL/DdsImagePlugin.py
View File

@ -215,8 +215,11 @@ class DdsImageFile(ImageFile.ImageFile):
magic, header_size = struct.unpack("<II", self.fp.read(8)) magic, header_size = struct.unpack("<II", self.fp.read(8))
if header_size != 124: if header_size != 124:
raise IOError("Unsupported header size %r" % (header_size)) raise IOError("Unsupported header size %r" % (header_size))
header = BytesIO(self.fp.read(header_size - 4)) header_bytes = self.fp.read(header_size - 4)
if len(header_bytes) != 120:
raise IOError("Incomplete header: %s bytes" % len(header_bytes))
header = BytesIO(header_bytes)
flags, height, width = struct.unpack("<3I", header.read(12)) flags, height, width = struct.unpack("<3I", header.read(12))
self.size = (width, height) self.size = (width, height)
self.mode = "RGBA" self.mode = "RGBA"
@ -244,11 +247,16 @@ class DdsImageFile(ImageFile.ImageFile):
raise NotImplementedError("Unimplemented pixel format %r" % raise NotImplementedError("Unimplemented pixel format %r" %
(fourcc)) (fourcc))
decoded_data = codec(self.fp, self.width, self.height) try:
decoded_data = codec(self.fp, self.width, self.height)
self.fp.close() except struct.error:
raise IOError("Truncated DDS file")
finally:
self.fp.close()
self.fp = BytesIO(decoded_data) self.fp = BytesIO(decoded_data)
def load_seek(self, pos): def load_seek(self, pos):
pass pass

24
Tests/test_file_dds.py
View File

@ -1,5 +1,6 @@
from helper import unittest, PillowTestCase from io import BytesIO
from helper import unittest, PillowTestCase
from PIL import Image, DdsImagePlugin from PIL import Image, DdsImagePlugin
TEST_FILE_DXT1 = "Tests/images/dxt1-rgb-4bbp-noalpha_MipMaps-1.dds" TEST_FILE_DXT1 = "Tests/images/dxt1-rgb-4bbp-noalpha_MipMaps-1.dds"
@ -44,7 +45,6 @@ class TestFileDds(PillowTestCase):
# I'm currently seeing about a 3 for the epsilon. # I'm currently seeing about a 3 for the epsilon.
self.assert_image_similar(target, im, 5) self.assert_image_similar(target, im, 5)
def test_sanity_dxt3(self): def test_sanity_dxt3(self):
"""Check DXT3 images are not supported""" """Check DXT3 images are not supported"""
self.assertRaises(NotImplementedError, self.assertRaises(NotImplementedError,
@ -72,6 +72,26 @@ class TestFileDds(PillowTestCase):
# Assert # Assert
self.assertFalse(output) self.assertFalse(output)
def test_short_header(self):
""" Check a short header"""
with open(TEST_FILE_DXT5, 'rb') as f:
img_file = f.read()
def short_header():
im = Image.open(BytesIO(img_file[:119]))
self.assertRaises(IOError, short_header)
def test_short_file(self):
""" Check that the appropriate error is thrown for a short file"""
with open(TEST_FILE_DXT5, 'rb') as f:
img_file = f.read()
def short_file():
im = Image.open(BytesIO(img_file[:-100]))
self.assertRaises(IOError, short_file)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()