Merge pull request #6219 from radarhere/gif_eof

Do not update GIF frame position until local image is found

Tests/test_file_gif.py

@@ -354,16 +354,23 @@ def test_seek_rewind():
             assert_image_equal(im, expected)
 
 
-def test_n_frames():
+@pytest.mark.parametrize(
-    for path, n_frames in [[TEST_GIF, 1], ["Tests/images/iss634.gif", 42]]:
+    "path, n_frames",
-        # Test is_animated before n_frames
+    (
-        with Image.open(path) as im:
+        (TEST_GIF, 1),
-            assert im.is_animated == (n_frames != 1)
+        ("Tests/images/comment_after_last_frame.gif", 2),
+        ("Tests/images/iss634.gif", 42),
+    ),
+)
+def test_n_frames(path, n_frames):
+    # Test is_animated before n_frames
+    with Image.open(path) as im:
+        assert im.is_animated == (n_frames != 1)
 
-        # Test is_animated after n_frames
+    # Test is_animated after n_frames
-        with Image.open(path) as im:
+    with Image.open(path) as im:
-            assert im.n_frames == n_frames
+        assert im.n_frames == n_frames
-            assert im.is_animated == (n_frames != 1)
+        assert im.is_animated == (n_frames != 1)
 
 
 def test_no_change():

src/PIL/GifImagePlugin.py

@@ -185,8 +185,6 @@ class GifImageFile(ImageFile.ImageFile):
         if not s or s == b";":
             raise EOFError
 
-        self.__frame = frame
-
         self.tile = []
 
         palette = None
@@ -291,6 +289,8 @@ class GifImageFile(ImageFile.ImageFile):
         if interlace is None:
             # self._fp = None
             raise EOFError
+
+        self.__frame = frame
         if not update_image:
             return