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

Merge pull request #8820 from radarhere/tiff_timeout

Browse Source 
If every TIFF tile covers the image, only use the last offset
This commit is contained in:
Hugo van Kemenade 2025-03-18 15:20:21 +02:00 committed by GitHub
commit 039ecaca62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PIL/TiffImagePlugin.py
View File

@ -1608,6 +1608,10 @@ class TiffImageFile(ImageFile.ImageFile):
raise ValueError(msg)
w = tilewidth
if w == xsize and h == ysize and self._planar_configuration != 2:
# Every tile covers the image. Only use the last offset
offsets = offsets[-1:]
for offset in offsets:
if x + w > xsize:
stride = w * sum(bps_tuple) / 8 # bytes per line
@ -1630,11 +1634,11 @@ class TiffImageFile(ImageFile.ImageFile):
args,
)
)
x = x + w
x += w
if x >= xsize:
x, y = 0, y + h
if y >= ysize:
x = y = 0
y = 0
layer += 1
else:
logger.debug("- unsupported data organization")