load truncated PNG

uploadcare · Aug 23, 2024 · cc632ca · cc632ca
1 parent 73f4359
commit cc632ca
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
@@ -992,16 +992,21 @@ def load_end(self):
                     length -= 4
                 try:
                     ImageFile._safe_read(self.fp, length)
-                except OSError as e:
+                except OSError:
                     if ImageFile.LOAD_TRUNCATED_IMAGES:
                         break
-                    else:
-                        raise e
+                    raise
             except AttributeError:
                 logger.debug("%r %s %s (unknown)", cid, pos, length)
-                s = ImageFile._safe_read(self.fp, length)
-                if cid[1:2].islower():
-                    self.private_chunks.append((cid, s, True))
+                try:
+                    s = ImageFile._safe_read(self.fp, length)
+                except OSError:
+                    if ImageFile.LOAD_TRUNCATED_IMAGES:
+                        break
+                    raise
+                else:
+                    if cid[1:2].islower():
+                        self.private_chunks.append((cid, s, True))
         self._text = self.png.im_text
         if not self.is_animated:
             self.png.close()