python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2026-02-04 06:25:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not attempt to read zero bytes

Browse Source
This commit is contained in:
Andrew Murray 2026-01-24 11:08:38 +11:00
parent a232e8ae44
commit 4b43e717c1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PIL/DdsImagePlugin.py
View File

@ -489,9 +489,14 @@ class DdsRgbDecoder(ImageFile.PyDecoder):
_pulls_fd = True
def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
assert self.fd is not None
bitcount, masks = self.args
data = bytearray()
bytecount = bitcount // 8
if not bytecount:
self.set_as_raw(data)
return -1, 0
# Some masks will be padded with zeros, e.g. R 0b11 G 0b1100
# Calculate how many zeros each mask is padded with
mask_offsets = []
@ -505,8 +510,7 @@ class DdsRgbDecoder(ImageFile.PyDecoder):
mask_offsets.append(offset)
mask_totals.append(mask >> offset)
data = bytearray()
bytecount = bitcount // 8
assert self.fd is not None
dest_length = self.state.xsize * self.state.ysize * len(masks)
while len(data) < dest_length:
bytes_read = self.fd.read(bytecount)