patched fixes that were accidentally removed

bitbank2 · Dec 18, 2021 · 9889e73 · 9889e73
1 parent dd37b58
commit 9889e73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/AnimatedGIF.cpp b/src/AnimatedGIF.cpp
@@ -196,6 +196,8 @@ long lTime = millis();
     if (GIFParseInfo(&_gif, 0))
     {
         _gif.pUser = pUser;
+        if (_gif.iError == GIF_EMPTY_FRAME) // don't try to decode it
+            return 0;
         rc = DecodeLZW(&_gif, 0);
         if (rc != 0) // problem
             return -1;

diff --git a/src/gif.inl b/src/gif.inl
@@ -317,7 +317,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
             }
         }
     }
-    while (p[iOffset] != ',') /* Wait for image separator */
+    while (p[iOffset] != ',' && p[iOffset] != ';') /* Wait for image separator */
     {
         if (p[iOffset] == '!') /* Extension block */
         {
@@ -416,6 +416,11 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
             return 0;
         }
     } /* while */
+    if (p[iOffset] == ';') { // end of file, quit and return a correct error code
+        pPage->iError = GIF_EMPTY_FRAME;
+        return 1;
+    }
+
     if (p[iOffset] == ',')
         iOffset++;
     // This particular frame's size and position on the main frame (if animated)