Merge pull request #8146 from Yay295/jp2_parsing

Author: hugovk

Tests/images/unknown_mode.j2k

@@ -335,6 +335,12 @@ def test_issue_6194() -> None:
         assert im.getpixel((5, 5)) == 31
 
 
+def test_unknown_j2k_mode() -> None:
+    with pytest.raises(UnidentifiedImageError):
+        with Image.open("Tests/images/unknown_mode.j2k"):
+            pass
+
+
 def test_unbound_local() -> None:
     # prepatch, a malformed jp2 file could cause an UnboundLocalError exception.
     with pytest.raises(UnidentifiedImageError):

Tests/test_file_jpeg2k.py

@@ -97,7 +97,7 @@ def next_box_type(self) -> bytes:
         return tbox
 
 
-def _parse_codestream(fp):
+def _parse_codestream(fp) -> tuple[tuple[int, int], str]:
     """Parse the JPEG 2000 codestream to extract the size and component
     count from the SIZ marker segment, returning a PIL (size, mode) tuple."""
 
@@ -122,7 +122,8 @@ def _parse_codestream(fp):
     elif csiz == 4:
         mode = "RGBA"
     else:
-        mode = ""
+        msg = "unable to determine J2K image mode"
+        raise SyntaxError(msg)
 
     return size, mode
 
@@ -237,10 +238,6 @@ def _open(self) -> None:
                 msg = "not a JPEG 2000 file"
                 raise SyntaxError(msg)
 
-        if self.size is None or not self.mode:
-            msg = "unable to determine size/mode"
-            raise SyntaxError(msg)
-
         self._reduce = 0
         self.layers = 0