python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-03 21:24:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8146 from Yay295/jp2_parsing

Browse Source
This commit is contained in:
Hugo van Kemenade 2024-06-26 11:32:57 +03:00 committed by GitHub
commit 2756cd5273
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/unknown_mode.j2k Normal file
View File

Binary file not shown.

6
Tests/test_file_jpeg2k.py
View File

@ -335,6 +335,12 @@ def test_issue_6194() -> None:
assert im.getpixel((5, 5)) == 31 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: def test_unbound_local() -> None:
# prepatch, a malformed jp2 file could cause an UnboundLocalError exception. # prepatch, a malformed jp2 file could cause an UnboundLocalError exception.
with pytest.raises(UnidentifiedImageError): with pytest.raises(UnidentifiedImageError):

9
src/PIL/Jpeg2KImagePlugin.py
View File

@ -97,7 +97,7 @@ class BoxReader:
return tbox 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 """Parse the JPEG 2000 codestream to extract the size and component
count from the SIZ marker segment, returning a PIL (size, mode) tuple.""" count from the SIZ marker segment, returning a PIL (size, mode) tuple."""
@ -122,7 +122,8 @@ def _parse_codestream(fp):
elif csiz == 4: elif csiz == 4:
mode = "RGBA" mode = "RGBA"
else: else:
mode = "" msg = "unable to determine J2K image mode"
raise SyntaxError(msg)
return size, mode return size, mode
@ -237,10 +238,6 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
msg = "not a JPEG 2000 file" msg = "not a JPEG 2000 file"
raise SyntaxError(msg) 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._reduce = 0
self.layers = 0 self.layers = 0