- use upstream patch instead of infinite loop fix

diff --git a/Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch b/Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch
deleted file mode 100644 (file)
index a90689a..0000000
--- a/Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 29 Nov 2017 19:37:38 +0100
-Subject: Fix #420: Potential infinite loop in gdImageCreateFromGifCtx
-origin: https://github.com/libgd/libgd/commit/a11f47475e6443b7f32d21f2271f28f417e2ac04
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-5711
-Bug-Debian: https://bugs.debian.org/887485
-Bug: https://github.com/libgd/libgd/issues/420
-
-Due to a signedness confusion in `GetCode_` a corrupt GIF file can
-trigger an infinite loop.  Furthermore we make sure that a GIF without
-any palette entries is treated as invalid *after* open palette entries
-have been removed.
-
-CVE-2018-5711
-
-See also https://bugs.php.net/bug.php?id=75571.
----
-
---- a/src/gd_gif_in.c
-+++ b/src/gd_gif_in.c
-@@ -335,11 +335,6 @@ terminated:
-               return 0;
-       }
- 
--      if(!im->colorsTotal) {
--              gdImageDestroy(im);
--              return 0;
--      }
--
-       /* Check for open colors at the end, so
-        * we can reduce colorsTotal and ultimately
-        * BitsPerPixel */
-@@ -351,6 +346,11 @@ terminated:
-               }
-       }
- 
-+      if(!im->colorsTotal) {
-+              gdImageDestroy(im);
-+              return 0;
-+      }
-+
-       return im;
- }
- 
-@@ -447,7 +447,7 @@ static int
- GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
- {
-       int i, j, ret;
--      unsigned char count;
-+      int count;
- 
-       if(flag) {
-               scd->curbit = 0;

diff --git a/gd.spec b/gd.spec
index e0474f95f837e7f842b6612b666033723e41e8bd..e7b04e3672ce6bb68cba8d85e8bde93911e79966 100644 (file)
--- a/gd.spec
+++ b/gd.spec
@@ -27,11 +27,10 @@ Patch3:             %{name}-liq.patch
 Patch4:                0004-Fix-OOB-read-due-to-crafted-GD-GD2-images.patch
 Patch5:                0005-Fix-tiff_invalid_read-check.patch
 Patch6:                bmp-check-return-value-in-gdImageBmpPtr.patch
-Patch7:                Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch
-Patch8:                gd-2.2.5-heap-based-buffer-overflow.patch
-Patch9:                gd-2.2.5-null-pointer.patch
-Patch10:       gd-2.2.5-potential-double-free.patch
-Patch11:       gd-2.2.5-upstream.patch
+Patch7:                gd-2.2.5-heap-based-buffer-overflow.patch
+Patch8:                gd-2.2.5-null-pointer.patch
+Patch9:                gd-2.2.5-potential-double-free.patch
+Patch10:       gd-2.2.5-upstream.patch
 URL:           https://libgd.github.io/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake