python-pillow/Pillow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy offset check from C into Python

Browse Source
This commit is contained in:
Andrew Murray 2026-03-28 23:45:57 +11:00 committed by Hugo van Kemenade
parent 591ce38ca5
commit b2a16f0dbe
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Tests/test_imagefile.py
View File

@ -308,7 +308,20 @@ class TestPyDecoder(CodecsTest):
assert MockPyDecoder.last.state.xsize == 200
assert MockPyDecoder.last.state.ysize == 200
def test_negsize(self) -> None:
def test_negative_offset(self) -> None:
buf = BytesIO(b"\x00" * 255)
im = MockImageFile(buf)
im.tile = [ImageFile._Tile("MOCK", (-10, yoff, xsize, ysize), 32, None)]
with pytest.raises(ValueError):
im.load()
im.tile = [ImageFile._Tile("MOCK", (xoff, -10, xsize, ysize), 32, None)]
with pytest.raises(ValueError):
im.load()
def test_negative_size(self) -> None:
buf = BytesIO(b"\x00" * 255)
im = MockImageFile(buf)
@ -386,7 +399,39 @@ class TestPyEncoder(CodecsTest):
assert MockPyEncoder.last.state.xsize == 200
assert MockPyEncoder.last.state.ysize == 200
def test_negsize(self) -> None:
def test_negative_offset(self) -> None:
buf = BytesIO(b"\x00" * 255)
im = MockImageFile(buf)
fp = BytesIO()
MockPyEncoder.last = None
with pytest.raises(ValueError):
ImageFile._save(
im,
fp,
[
ImageFile._Tile(
"MOCK", (-10, yoff, xoff + xsize, yoff + ysize), 0, "RGB"
)
],
)
last: MockPyEncoder | None = MockPyEncoder.last
assert last
assert last.cleanup_called
with pytest.raises(ValueError):
ImageFile._save(
im,
fp,
[
ImageFile._Tile(
"MOCK", (xoff, -10, xoff + xsize, yoff + ysize), 0, "RGB"
)
],
)
def test_negative_size(self) -> None:
buf = BytesIO(b"\x00" * 255)
im = MockImageFile(buf)

11
src/PIL/ImageFile.py
View File

@ -805,6 +805,10 @@ class PyCodec:
if extents:
x0, y0, x1, y1 = extents
if x0 < 0 or y0 < 0 or x1 > self.im.size[0] or y1 > self.im.size[1]:
msg = "Tile cannot extend outside image"
raise ValueError(msg)
else:
x0, y0, x1, y1 = (0, 0, 0, 0)
@ -820,13 +824,6 @@ class PyCodec:
msg = "Size must be positive"
raise ValueError(msg)
if (
self.state.xsize + self.state.xoff > self.im.size[0]
or self.state.ysize + self.state.yoff > self.im.size[1]
):
msg = "Tile cannot extend outside image"
raise ValueError(msg)
class PyDecoder(PyCodec):
"""