python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 09:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Test not enough image data

Browse Source
This commit is contained in:
Andrew Murray 2025-04-09 23:41:45 +10:00
parent 395bd6bd12
commit 6512a8e371
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/test_file_xpm.py
View File

@ -1,5 +1,7 @@
from __future__ import annotations from __future__ import annotations
from io import BytesIO
import pytest import pytest
from PIL import Image, XpmImagePlugin from PIL import Image, XpmImagePlugin
@ -31,6 +33,14 @@ def test_rgb() -> None:
assert_image_similar(im, hopper(), 16) assert_image_similar(im, hopper(), 16)
def test_not_enough_image_data() -> None:
with open(TEST_FILE, "rb") as fp:
data = fp.read().split(b"/* pixels */")[0]
with Image.open(BytesIO(data)) as im:
with pytest.raises(ValueError, match="not enough image data"):
im.load()
def test_invalid_file() -> None: def test_invalid_file() -> None:
invalid_file = "Tests/images/flower.jpg" invalid_file = "Tests/images/flower.jpg"

4
src/PIL/XpmImagePlugin.py
View File

@ -125,11 +125,11 @@ class XpmDecoder(ImageFile.PyDecoder):
pixel_header = False pixel_header = False
while len(data) < dest_length: while len(data) < dest_length:
s = self.fd.readline() s = self.fd.readline()
if not s:
break
if s.rstrip() == b"/* pixels */" and not pixel_header: if s.rstrip() == b"/* pixels */" and not pixel_header:
pixel_header = True pixel_header = True
continue continue
if not s:
break
s = b'"'.join(s.split(b'"')[1:-1]) s = b'"'.join(s.split(b'"')[1:-1])
for i in range(0, len(s), bpp): for i in range(0, len(s), bpp):
key = s[i : i + bpp] key = s[i : i + bpp]