Merge pull request #3023 from kkopachev/issue-3022

Certain corrupted jpegs can result in no data read

Tests/test_file_jpeg.py

@@ -348,6 +348,22 @@ class TestFileJpeg(PillowTestCase):
         filename = "Tests/images/jpeg_ff00_header.jpg"
         Image.open(filename)
 
+    def test_truncated_jpeg_should_read_all_the_data(self):
+        filename = "Tests/images/truncated_jpeg.jpg"
+        ImageFile.LOAD_TRUNCATED_IMAGES = True
+        im = Image.open(filename)
+        im.load()
+        ImageFile.LOAD_TRUNCATED_IMAGES = False
+        self.assertIsNotNone(im.getbbox())
+
+    def test_truncated_jpeg_throws_IOError(self):
+        filename = "Tests/images/truncated_jpeg.jpg"
+        im = Image.open(filename)
+
+        with self.assertRaises(IOError):
+            im.load()
+
+
     def _n_qtables_helper(self, n, test_file):
         im = Image.open(test_file)
         f = self.tempfile('temp.jpg')

src/PIL/ImageFile.py

@@ -202,6 +202,7 @@ class ImageFile(Image.Image):
             for decoder_name, extents, offset, args in self.tile:
                 decoder = Image._getdecoder(self.mode, decoder_name,
                                             args, self.decoderconfig)
+                try:
                     seek(offset)
                     decoder.setimage(self.im, extents)
                     if decoder.pulls_fd:
@@ -219,16 +220,10 @@ class ImageFile(Image.Image):
                                     raise IOError("image file is truncated")
 
                             if not s:  # truncated jpeg
-                            self.tile = []
-
-                            # JpegDecode needs to clean things up here either way
-                            # If we don't destroy the decompressor,
-                            # we have a memory leak.
-                            decoder.cleanup()
-
                                 if LOAD_TRUNCATED_IMAGES:
                                     break
                                 else:
+                                    self.tile = []
                                     raise IOError("image file is truncated "
                                                   "(%d bytes not processed)" % len(b))
 
@@ -237,8 +232,8 @@ class ImageFile(Image.Image):
                             if n < 0:
                                 break
                             b = b[n:]
-
-                # Need to cleanup here to prevent leaks in PyPy
+                finally:
+                    # Need to cleanup here to prevent leaks
                     decoder.cleanup()
 
         self.tile = []

src/PIL/JpegImagePlugin.py

@@ -353,6 +353,21 @@ class JpegImageFile(ImageFile.ImageFile):
             else:
                 raise SyntaxError("no marker found")
 
+    def load_read(self, read_bytes):
+        """
+        internal: read more image data
+        For premature EOF and LOAD_TRUNCATED_IMAGES adds EOI marker
+        so libjpeg can finish decoding
+        """
+        s = self.fp.read(read_bytes)
+
+        if not s and ImageFile.LOAD_TRUNCATED_IMAGES:
+            # Premature EOF.
+            # Pretend file is finished adding EOI marker
+            return b"\xFF\xD9"
+
+        return s
+
     def draft(self, mode, size):
 
         if len(self.tile) != 1: