python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 09:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4103 from radarhere/dimension

Browse Source 
Raise error if TIFF dimension is a string
This commit is contained in:
Andrew Murray 2019-09-30 21:26:53 +10:00 committed by GitHub
commit b9693a51c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/string_dimension.tiff Normal file
View File

Binary file not shown.

5
Tests/test_file_tiff.py
View File

@ -587,6 +587,11 @@ class TestFileTiff(PillowTestCase):
im.load() im.load()
self.assertFalse(fp.closed) self.assertFalse(fp.closed)
def test_string_dimension(self):
# Assert that an error is raised if one of the dimensions is a string
with self.assertRaises(ValueError):
Image.open("Tests/images/string_dimension.tiff")
@unittest.skipUnless(sys.platform.startswith("win32"), "Windows only") @unittest.skipUnless(sys.platform.startswith("win32"), "Windows only")
class TestFileTiffW32(PillowTestCase): class TestFileTiffW32(PillowTestCase):

4
src/PIL/TiffImagePlugin.py
View File

@ -1239,8 +1239,8 @@ class TiffImageFile(ImageFile.ImageFile):
print("- YCbCr subsampling:", self.tag.get(530)) print("- YCbCr subsampling:", self.tag.get(530))
# size # size
xsize = self.tag_v2.get(IMAGEWIDTH) xsize = int(self.tag_v2.get(IMAGEWIDTH))
ysize = self.tag_v2.get(IMAGELENGTH) ysize = int(self.tag_v2.get(IMAGELENGTH))
self._size = xsize, ysize self._size = xsize, ysize
if DEBUG: if DEBUG: