From 54a4a38e42d4cecc380628cb47a3421779503690 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 8 Mar 2022 19:48:58 +1100 Subject: [PATCH 1/2] Return -1 when finished decoding --- src/PIL/BlpImagePlugin.py | 2 +- src/PIL/ImageFile.py | 2 +- src/PIL/MspImagePlugin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 779fddea860..ecd3da5dfe3 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -306,7 +306,7 @@ def decode(self, buffer): self._load() except struct.error as e: raise OSError("Truncated BLP file") from e - return 0, 0 + return -1, 0 def _read_blp_header(self): self.fd.seek(4) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 7cb4f223bfa..aac961a7663 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -664,7 +664,7 @@ def decode(self, buffer): :param buffer: A bytes object with the data to be decoded. :returns: A tuple of ``(bytes consumed, errcode)``. - If finished with decoding return 0 for the bytes consumed. + If finished with decoding return -1 for the bytes consumed. Err codes are from :data:`.ImageFile.ERRORS`. """ raise NotImplementedError() diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 32b28d44d5f..c4d7ddbb4f8 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -148,7 +148,7 @@ def decode(self, buffer): self.set_as_raw(img.getvalue(), ("1", 0, 1)) - return 0, 0 + return -1, 0 Image.register_decoder("MSP", MspDecoder) From e87432b745060dc3ec34119bfe1a198578fd7fa2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 8 Mar 2022 19:51:24 +1100 Subject: [PATCH 2/2] First return value is unused --- src/PIL/ImageFile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index aac961a7663..34f344f1d00 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -231,7 +231,7 @@ def load(self): decoder.setimage(self.im, extents) if decoder.pulls_fd: decoder.setfd(self.fp) - status, err_code = decoder.decode(b"") + err_code = decoder.decode(b"")[1] else: b = prefix while True: