From add2746ac61980421455dc722d0edede2478cbfa Mon Sep 17 00:00:00 2001
From: Konstantin Kopachev <tenzzor@gmail.com>
Date: Wed, 28 Feb 2018 22:15:58 -0800
Subject: [PATCH 1/3] Certain corrupted jpegs can result in no data read

On truncated jpeg, decoder can suspend waiting for additional bytes in
buffer. For some input files, decoder suspends on jpeg_start_decompress
stage. If at this point file reader reaches EOF, py code never gets back
to jpeg decoder and we end up with no bytes to result image. This leaves
us with some amount of potentially useful bytes undecoded and thrown
away.
Libjpeg docs suggest that in such situation, more appropriate would be
to add EOI marker to the end of buffer, which will allows decoder
to finish. https://github.com/libjpeg-turbo/libjpeg-turbo/blob/0dd9a2c1fd6c/libjpeg.txt#L1803-L1809
Docs also mention that adding EOI markers is what non-suspending code
does anyway.
---
 src/PIL/ImageFile.py | 69 ++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py
index 458857f41..7dbea67f3 100644
--- a/src/PIL/ImageFile.py
+++ b/src/PIL/ImageFile.py
@@ -202,44 +202,39 @@ class ImageFile(Image.Image):
             for decoder_name, extents, offset, args in self.tile:
                 decoder = Image._getdecoder(self.mode, decoder_name,
                                             args, self.decoderconfig)
-                seek(offset)
-                decoder.setimage(self.im, extents)
-                if decoder.pulls_fd:
-                    decoder.setfd(self.fp)
-                    status, err_code = decoder.decode(b"")
-                else:
-                    b = prefix
-                    while True:
-                        try:
-                            s = read(self.decodermaxblock)
-                        except (IndexError, struct.error):  # truncated png/gif
-                            if LOAD_TRUNCATED_IMAGES:
+                try:
+                    seek(offset)
+                    decoder.setimage(self.im, extents)
+                    if decoder.pulls_fd:
+                        decoder.setfd(self.fp)
+                        status, err_code = decoder.decode(b"")
+                    else:
+                        b = prefix
+                        while True:
+                            try:
+                                s = read(self.decodermaxblock)
+                            except (IndexError, struct.error):  # truncated png/gif
+                                if LOAD_TRUNCATED_IMAGES:
+                                    break
+                                else:
+                                    raise IOError("image file is truncated")
+
+                            if not s:  # truncated jpeg
+                                if LOAD_TRUNCATED_IMAGES:
+                                    s = b"\xFF\xD9"  # Pretend file is finished adding EOI marker
+                                else:
+                                    self.tile = []
+                                    raise IOError("image file is truncated "
+                                                  "(%d bytes not processed)" % len(b))
+
+                            b = b + s
+                            n, err_code = decoder.decode(b)
+                            if n < 0:
                                 break
-                            else:
-                                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:
-                                raise IOError("image file is truncated "
-                                              "(%d bytes not processed)" % len(b))
-
-                        b = b + s
-                        n, err_code = decoder.decode(b)
-                        if n < 0:
-                            break
-                        b = b[n:]
-
-                # Need to cleanup here to prevent leaks in PyPy
-                decoder.cleanup()
+                            b = b[n:]
+                finally:
+                    # Need to cleanup here to prevent leaks
+                    decoder.cleanup()
 
         self.tile = []
         self.readonly = readonly

From 1e9e64c8b05727ddcb9b2428f4796743a1ce1e1c Mon Sep 17 00:00:00 2001
From: Konstantin Kopachev <tenzzor@gmail.com>
Date: Mon, 5 Mar 2018 21:05:56 -0800
Subject: [PATCH 2/3] Move jpeg-specific eof-processing to jpeg plugin

---
 src/PIL/ImageFile.py       |  2 +-
 src/PIL/JpegImagePlugin.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py
index 7dbea67f3..39ad1f093 100644
--- a/src/PIL/ImageFile.py
+++ b/src/PIL/ImageFile.py
@@ -221,7 +221,7 @@ class ImageFile(Image.Image):
 
                             if not s:  # truncated jpeg
                                 if LOAD_TRUNCATED_IMAGES:
-                                    s = b"\xFF\xD9"  # Pretend file is finished adding EOI marker
+                                    break
                                 else:
                                     self.tile = []
                                     raise IOError("image file is truncated "
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
index 9a190fb4a..6a18fff19 100644
--- a/src/PIL/JpegImagePlugin.py
+++ b/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:

From 5269bbc268da758998acb7ba8604ca02eef2b7a0 Mon Sep 17 00:00:00 2001
From: Konstantin Kopachev <tenzzor@gmail.com>
Date: Wed, 7 Mar 2018 21:31:51 -0800
Subject: [PATCH 3/3] Add truncated jpeg tests

---
 Tests/images/truncated_jpeg.jpg | Bin 0 -> 6698 bytes
 Tests/test_file_jpeg.py         |  16 ++++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 Tests/images/truncated_jpeg.jpg

diff --git a/Tests/images/truncated_jpeg.jpg b/Tests/images/truncated_jpeg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f4fec450df95ab99ae051c23d0fc51362c7cef17
GIT binary patch
literal 6698
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

literal 0
HcmV?d00001

diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index f46414370..e757f151f 100644
--- a/Tests/test_file_jpeg.py
+++ b/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')