Limit raw tile size to avoid extending outside image

python-pillow · Jun 15, 2022 · f51fc71 · f51fc71
1 parent e80ddfd
commit f51fc71
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/Tests/images/input_bw_one_band.fpx b/Tests/images/input_bw_one_band.fpx
diff --git a/Tests/images/input_bw_one_band.png b/Tests/images/input_bw_one_band.png
diff --git a/Tests/test_file_fpx.py b/Tests/test_file_fpx.py
@@ -2,11 +2,22 @@
 
 from PIL import Image
 
+from .helper import assert_image_equal_tofile
+
 FpxImagePlugin = pytest.importorskip(
     "PIL.FpxImagePlugin", reason="olefile not installed"
 )
 
 
+def test_sanity():
+    with Image.open("Tests/images/input_bw_one_band.fpx") as im:
+        assert im.mode == "L"
+        assert im.size == (70, 46)
+        assert im.format == "FPX"
+
+        assert_image_equal_tofile(im, "Tests/images/input_bw_one_band.png")
+
+
 def test_invalid_file():
     # Test an invalid OLE file
     invalid_file = "Tests/images/flower.jpg"

diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
@@ -160,7 +160,7 @@ def _open_subimage(self, index=1, subimage=0):
                 self.tile.append(
                     (
                         "raw",
-                        (x, y, x + xtile, y + ytile),
+                        (x, y, min(xsize, x + xtile), min(ysize, y + ytile)),
                         i32(s, i) + 28,
                         (self.rawmode,),
                     )