From 87e54b47abcea034cfcba6081f3596b2584a8322 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <glenn@zewt.org>
Date: Wed, 24 Oct 2018 00:53:21 -0500
Subject: [PATCH] GIF: Fix the previous frame not always being decoded in
 _seek.

_seek checked whether self.im is None, but if we've decoded a frame
and then seeked back to 0, self.im will be set to the previously
decoded frame.  Instead, check if self.tile has data, which means
_seek set up a tile to decode and it hasn't been decoded yet.
---
 Tests/images/rewind.gif   | Bin 0 -> 142 bytes
 Tests/test_file_gif.py    |  20 ++++++++++++++++++++
 src/PIL/GifImagePlugin.py |   2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Tests/images/rewind.gif

diff --git a/Tests/images/rewind.gif b/Tests/images/rewind.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fea03b1d59c793847c36d4bde5e3cbf8a2913936
GIT binary patch
literal 142
zcmZ?wbhEHbWM*JySj50^?>_?w{FkVzssgj1gyK&YRxSn>1|1L|q?Uo1jl)@Zu>vCl
cP>RzCRf<Jp$(Gq5305=-Bt7WHLG)My0M*J9XaE2J

literal 0
HcmV?d00001

diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py
index f1d9d688f..8501ec380 100644
--- a/Tests/test_file_gif.py
+++ b/Tests/test_file_gif.py
@@ -293,6 +293,26 @@ class TestFileGif(PillowTestCase):
                 self.assertEqual(color, expected_colors[frame][x],
                     'frame %i, x %i' % (frame, x))
 
+    def test_rewind(self):
+        img = Image.open("Tests/images/rewind.gif")
+
+        # Seek forwards to frame 2.  This will decode frames 0 and 1.
+        img.seek(2)
+
+        # Seek back to frame 1.  This will rewind to frame 0, then seek
+        # to frame 1.
+        img.seek(1)
+
+        # Read data.  This should decode frame 0 and then frame 1.
+        img.getpixel((0,1))
+
+        expected_colors = [(2, 3), (3, 1)]
+        for x in range(2):
+            for y in range(2):
+                color = img.getpixel((x,y))
+                self.assertEqual(color, expected_colors[x][y],
+                    '%ix%i' % (x, y))
+
     def test_dispose_previous(self):
         img = Image.open("Tests/images/dispose_prev.gif")
         try:
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
index ecf4c2be5..5c17545cd 100644
--- a/src/PIL/GifImagePlugin.py
+++ b/src/PIL/GifImagePlugin.py
@@ -144,7 +144,7 @@ class GifImageFile(ImageFile.ImageFile):
             self.disposal_method = 0
         else:
             # ensure that the previous frame was loaded
-            if not self.im:
+            if self.tile:
                 self.load()
 
         if frame != self.__frame + 1: