Merge pull request #4103 from radarhere/dimension

Raise error if TIFF dimension is a string
python-pillow · Sep 30, 2019 · b9693a5 · b9693a5
2 parents f228d0c + 9a977b9
commit b9693a5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Tests/images/string_dimension.tiff b/Tests/images/string_dimension.tiff
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
@@ -587,6 +587,11 @@ def test_close_on_load_nonexclusive(self):
             im.load()
             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")
 class TestFileTiffW32(PillowTestCase):

diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
@@ -1239,8 +1239,8 @@ def _setup(self):
             print("- YCbCr subsampling:", self.tag.get(530))
 
         # size
-        xsize = self.tag_v2.get(IMAGEWIDTH)
-        ysize = self.tag_v2.get(IMAGELENGTH)
+        xsize = int(self.tag_v2.get(IMAGEWIDTH))
+        ysize = int(self.tag_v2.get(IMAGELENGTH))
         self._size = xsize, ysize
 
         if DEBUG: