Merge pull request #7483 from radarhere/psd

python-pillow · Dec 21, 2023 · 7e30619 · 7e30619
2 parents e2c9e33 + 5056850
commit 7e30619
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Tests/images/five_channels.psd b/Tests/images/five_channels.psd
diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py
@@ -111,6 +111,11 @@ def test_rgba():
         assert_image_equal_tofile(im, "Tests/images/imagedraw_square.png")
 
 
+def test_layer_skip():
+    with Image.open("Tests/images/five_channels.psd") as im:
+        assert im.n_frames == 1
+
+
 def test_icc_profile():
     with Image.open(test_file) as im:
         assert "icc_profile" in im.info

diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py
@@ -186,6 +186,9 @@ def read(size):
         ct_types = i16(read(2))
         types = list(range(ct_types))
         if len(types) > 4:
+            fp.seek(len(types) * 6 + 12, io.SEEK_CUR)
+            size = i32(read(4))
+            fp.seek(size, io.SEEK_CUR)
             continue
 
         for _ in types: