[packages/gd] - updated to 2.3.0 (upstream fixes for CVE-2018-5711 CVE-2018-14553 CVE-2018-1000222 CVE-2019-6977 C
qboosh
qboosh at pld-linux.org
Sun Apr 19 07:41:13 CEST 2020
commit 489009f3896d2b30580d503a0988e2186b6cfc0e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 19 07:41:18 2020 +0200
- updated to 2.3.0 (upstream fixes for CVE-2018-5711 CVE-2018-14553 CVE-2018-1000222 CVE-2019-6977 CVE-2019-6978 CVE-2019-11038)
- removed obsolete liq,Fix-OOB-read-due-to-crafted-GD-GD2-images,Fix-tiff_invalid_read-check,bmp-check-return-value-in-gdImageBmpPtr,heap-based-buffer-overflow,null-pointer,potential-double-free,upstream patches
- added missing patch (missing file from git)
- added raqm patch
...Fix-OOB-read-due-to-crafted-GD-GD2-images.patch | Bin 4595 -> 0 bytes
0005-Fix-tiff_invalid_read-check.patch | 23 --
bmp-check-return-value-in-gdImageBmpPtr.patch | 79 ------
gd-2.2.5-heap-based-buffer-overflow.patch | 28 --
gd-2.2.5-null-pointer.patch | 74 ------
gd-2.2.5-potential-double-free.patch | 283 ---------------------
gd-2.2.5-upstream.patch | 62 -----
gd-liq.patch | 11 -
gd-missing.patch | 45 ++++
gd.spec | 42 ++-
10 files changed, 63 insertions(+), 584 deletions(-)
---
diff --git a/gd.spec b/gd.spec
index e7b04e3..3f83a2b 100644
--- a/gd.spec
+++ b/gd.spec
@@ -2,6 +2,7 @@
# Conditional build:
%bcond_without fontconfig # fontconfig support
%bcond_with libimagequant # LIQ quantization method support (breaks transparency in TrueColor->palette conversion)
+%bcond_without raqm # RAQM complex text layout support
%bcond_with sse # SSE math on ix86
%bcond_without xpm # XPM support (requires X11 libs)
%bcond_without tests # "make check"
@@ -14,23 +15,16 @@ Summary(es.UTF-8): Biblioteca para manipulación de imágenes
Summary(pl.UTF-8): Biblioteka do tworzenia grafiki w formacie PNG, JPEG
Summary(pt_BR.UTF-8): Biblioteca para manipulação de imagens
Name: gd
-Version: 2.2.5
-Release: 5
+Version: 2.3.0
+Release: 1
License: BSD-like
Group: Libraries
#Source0Download: https://github.com/libgd/libgd/releases
Source0: https://github.com/libgd/libgd/releases/download/%{name}-%{version}/lib%{name}-%{version}.tar.xz
-# Source0-md5: 8d8d6a6189513ecee6e893b1fb109bf8
+# Source0-md5: 44e052abf0914bf1b93ceb1af564766f
Patch0: %{name}-fontpath.patch
+Patch1: %{name}-missing.patch
Patch2: %{name}-loop.patch
-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: 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
@@ -40,6 +34,7 @@ BuildRequires: gettext-tools
%{?with_libimagequant:BuildRequires: libimagequant-devel}
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 2:1.4.0
+%{?with_raqm:BuildRequires: libraqm-devel}
BuildRequires: libtiff-devel >= 4
BuildRequires: libtool >= 2:2
BuildRequires: libwebp-devel
@@ -100,6 +95,7 @@ Requires: freetype-devel >= 1:2.1.10
%{?with_libimagequant:Requires: libimagequant-devel}
Requires: libjpeg-devel
Requires: libpng-devel
+%{?with_raqm:Requires: libraqm-devel}
Requires: libtiff-devel >= 4
Requires: libwebp-devel
%{?with_xpm:Requires: xorg-lib-libXpm-devel}
@@ -167,24 +163,18 @@ para uso pelos programas que usam a libgd.
%prep
%setup -q -n libgd-%{version}
%patch0 -p1
+%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+chmod 755 config/getlib.sh
# hack to avoid inclusion of -s in --ldflags
-%{__sed} -i -e 's, at LDFLAGS@,,g' config/gdlib-config.in
+#%{__sed} -i -e 's, at LDFLAGS@,,g' config/gdlib-config.in
# disable error caused by subdir-objects warning in automake 1.14
-%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
+#%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__automake}
%{__autoheader}
%{__autoconf}
@@ -196,6 +186,7 @@ CFLAGS="%{rpmcflags} -msse -mfpmath=sse"
%configure \
%{!?with_fontconfig:--without-fontconfig} \
%{!?with_libimagequant:--without-liq} \
+ %{!?with_raqm:--without-raqm} \
%{!?with_xpm:--without-xpm}
%{__make}
@@ -205,9 +196,13 @@ CFLAGS="%{rpmcflags} -msse -mfpmath=sse"
XFAIL_TESTS="$XFAIL_TESTS gdimagegrayscale/basic"
%if %{without sse}
# 387 arithmetic is inexact, https://github.com/libgd/libgd/issues/242
-XFAIL_TESTS="$XFAIL_TESTS gdimagecopyresampled/bug00201 gdimagerotate/bug00067"
+XFAIL_TESTS="$XFAIL_TESTS gdimagecopyresampled/bug00201"
%endif
%endif
+%if %{with raqm}
+# https://github.com/libgd/libgd/issues/613
+XFAIL_TESTS="$XFAIL_TESTS gdimagestringft/gdimagestringft_bbox"
+%endif
export XFAIL_TESTS
%{__make} check
%endif
@@ -232,7 +227,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gdlib-config
%attr(755,root,root) %{_libdir}/libgd.so
%{_libdir}/libgd.la
%{_includedir}/entities.h
diff --git a/0004-Fix-OOB-read-due-to-crafted-GD-GD2-images.patch b/0004-Fix-OOB-read-due-to-crafted-GD-GD2-images.patch
deleted file mode 100644
index 2e1f417..0000000
Binary files a/0004-Fix-OOB-read-due-to-crafted-GD-GD2-images.patch and /dev/null differ
diff --git a/0005-Fix-tiff_invalid_read-check.patch b/0005-Fix-tiff_invalid_read-check.patch
deleted file mode 100644
index 5f69f9d..0000000
--- a/0005-Fix-tiff_invalid_read-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: "Christoph M. Becker" <cmbecker69 at gmx.de>
-Date: Wed, 18 Jan 2017 21:06:29 +0100
-Subject: Fix tiff_invalid_read check
-
----
- src/gd_io_dp.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
-index 25c0980..934204d 100755
---- a/src/gd_io_dp.c
-+++ b/src/gd_io_dp.c
-@@ -299,6 +299,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
- return 0;
- }
-
-+ if (rlen < 0) {
-+ return 0;
-+ }
-+
- memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen);
- dp->pos += rlen;
-
diff --git a/bmp-check-return-value-in-gdImageBmpPtr.patch b/bmp-check-return-value-in-gdImageBmpPtr.patch
deleted file mode 100644
index f0e3a52..0000000
--- a/bmp-check-return-value-in-gdImageBmpPtr.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Mike Frysinger <vapier at gentoo.org>
-Date: Sat, 14 Jul 2018 13:54:08 -0400
-Subject: bmp: check return value in gdImageBmpPtr
-Origin: https://github.com/libgd/libgd/commit/ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-1000222
-Bug-Debian: https://bugs.debian.org/906886
-Bug: https://github.com/libgd/libgd/issues/447
-
-Closes #447.
----
- src/gd_bmp.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/gd_bmp.c b/src/gd_bmp.c
-index bde0b9d3abbd..78f40d9a475e 100644
---- a/src/gd_bmp.c
-+++ b/src/gd_bmp.c
-@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
- static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header);
- static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info);
-
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);
-+
- #define BMP_DEBUG(s)
-
- static int gdBMPPutWord(gdIOCtx *out, int w)
-@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageBmpCtx(im, out, compression);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageBmpCtx(im, out, compression))
-+ rv = gdDPExtractData(out, size);
-+ else
-+ rv = NULL;
- out->gd_free(out);
- return rv;
- }
-@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression)
- compression - whether to apply RLE or not.
- */
- BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
-+{
-+ _gdImageBmpCtx(im, out, compression);
-+}
-+
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- {
- int bitmap_size = 0, info_size, total_size, padding;
- int i, row, xpos, pixel;
-@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL;
- FILE *tmpfile_for_compression = NULL;
- gdIOCtxPtr out_original = NULL;
-+ int ret = 1;
-
- /* No compression if its true colour or we don't support seek */
- if (im->trueColor) {
-@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- out_original = NULL;
- }
-
-+ ret = 0;
- cleanup:
- if (tmpfile_for_compression) {
- #ifdef _WIN32
-@@ -338,7 +349,7 @@ cleanup:
- if (out_original) {
- out_original->gd_free(out_original);
- }
-- return;
-+ return ret;
- }
-
- static int compress_row(unsigned char *row, int length)
---
-2.19.1
-
diff --git a/gd-2.2.5-heap-based-buffer-overflow.patch b/gd-2.2.5-heap-based-buffer-overflow.patch
deleted file mode 100644
index ae795d0..0000000
--- a/gd-2.2.5-heap-based-buffer-overflow.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 98b2e94e62d873acbcc6d968f1f97af9749fe021 Mon Sep 17 00:00:00 2001
-From: Ondrej Dubaj <odubaj at redhat.com>
-Date: Tue, 4 Jun 2019 10:54:45 +0200
-Subject: [PATCH] heap based buffer overflow in
- gd_color_match.c:gdImageColorMatch() in libgd as used in imagecolormatch()
-
----
- src/gd_color_match.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gd_color_match.c b/src/gd_color_match.c
-index f0842b6..a94a841 100755
---- a/src/gd_color_match.c
-+++ b/src/gd_color_match.c
-@@ -31,8 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdImagePtr im1, gdImagePtr im2)
- return -4; /* At least 1 color must be allocated */
- }
-
-- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal);
-- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal );
-+ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors);
-+ memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors );
-
- for (x=0; x < im1->sx; x++) {
- for( y=0; y<im1->sy; y++ ) {
---
-2.17.1
-
diff --git a/gd-2.2.5-null-pointer.patch b/gd-2.2.5-null-pointer.patch
deleted file mode 100644
index afa18d9..0000000
--- a/gd-2.2.5-null-pointer.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= <fcabralpacheco at gmail.com>
-Date: Fri, 20 Dec 2019 12:03:33 -0300
-Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone()
-
----
- src/gd.c | 9 +--------
- tests/gdimageclone/style.c | 30 ++++++++++++++++++++++++++++++
- 5 files changed, 35 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimageclone/style.c
-
-diff --git a/src/gd.c b/src/gd.c
-index 592a0286..d564d1f9 100644
---- a/src/gd.c
-+++ b/src/gd.c
-@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
- }
- }
-
-- if (src->styleLength > 0) {
-- dst->styleLength = src->styleLength;
-- dst->stylePos = src->stylePos;
-- for (i = 0; i < src->styleLength; i++) {
-- dst->style[i] = src->style[i];
-- }
-- }
--
- dst->interlace = src->interlace;
-
- dst->alphaBlendingFlag = src->alphaBlendingFlag;
-@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
-
- if (src->style) {
- gdImageSetStyle(dst, src->style, src->styleLength);
-+ dst->stylePos = src->stylePos;
- }
-
- for (i = 0; i < gdMaxColors; i++) {
-diff --git a/tests/gdimageclone/style.c b/tests/gdimageclone/style.c
-new file mode 100644
-index 00000000..c2b246ed
---- /dev/null
-+++ b/tests/gdimageclone/style.c
-@@ -0,0 +1,30 @@
-+/**
-+ * Cloning an image should exactly reproduce all style related data
-+ */
-+
-+
-+#include <string.h>
-+#include "gd.h"
-+#include "gdtest.h"
-+
-+
-+int main()
-+{
-+ gdImagePtr im, clone;
-+ int style[] = {0, 0, 0};
-+
-+ im = gdImageCreate(8, 8);
-+ gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0]));
-+
-+ clone = gdImageClone(im);
-+ gdTestAssert(clone != NULL);
-+
-+ gdTestAssert(clone->styleLength == im->styleLength);
-+ gdTestAssert(clone->stylePos == im->stylePos);
-+ gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0])));
-+
-+ gdImageDestroy(clone);
-+ gdImageDestroy(im);
-+
-+ return gdNumFailures();
-+}
diff --git a/gd-2.2.5-potential-double-free.patch b/gd-2.2.5-potential-double-free.patch
deleted file mode 100644
index 788a068..0000000
--- a/gd-2.2.5-potential-double-free.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 4d9d8368d08c3a2be3ea4193b9314fffeddace52 Mon Sep 17 00:00:00 2001
-From: Ondrej Dubaj <odubaj at redhat.com>
-Date: Tue, 4 Jun 2019 13:38:41 +0200
-Subject: [PATCH] Potential double-free in gdImage*Ptr()
-
-Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we
-must not call `gdDPExtractData()`; otherwise a double-free would
-happen. Since `gdImage*Ctx()` are void functions, and we can't change
-that for BC reasons, we're introducing static helpers which are used
-internally.
-
-We're adding a regression test for `gdImageJpegPtr()`, but not for
-`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to
-trigger failure of the respective `gdImage*Ctx()` calls.
-
-This potential security issue has been reported by Solmaz Salimi (aka.
-Rooney).
----
- src/gd_gif_out.c | 19 +++++++++++++++----
- src/gd_jpeg.c | 20 ++++++++++++++++----
- src/gd_wbmp.c | 21 ++++++++++++++++++---
- tests/jpeg/CMakeLists.txt | 1 +
- tests/jpeg/Makemodule.am | 3 ++-
- tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++
- 6 files changed, 83 insertions(+), 12 deletions(-)
- create mode 100644 tests/jpeg/jpeg_ptr_double_free.c
-
-diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c
-index 6fe707d..4a05c09 100755
---- a/src/gd_gif_out.c
-+++ b/src/gd_gif_out.c
-@@ -99,7 +99,7 @@ static void char_init(GifCtx *ctx);
- static void char_out(int c, GifCtx *ctx);
- static void flush_char(GifCtx *ctx);
-
--
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
-
-
- /*
-@@ -131,8 +131,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageGifCtx(im, out);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageGifCtx(im, out)) {
-+ rv = gdDPExtractData(out, size);
-+ } else {
-+ rv = NULL;
-+ }
- out->gd_free(out);
- return rv;
- }
-@@ -220,6 +223,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile)
-
- */
- BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
-+{
-+ _gdImageGifCtx(im, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- {
- gdImagePtr pim = 0, tim = im;
- int interlace, BitsPerPixel;
-@@ -231,7 +240,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- based temporary image. */
- pim = gdImageCreatePaletteFromTrueColor(im, 1, 256);
- if(!pim) {
-- return;
-+ return 1;
- }
- tim = pim;
- }
-@@ -247,6 +256,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- /* Destroy palette based temporary image. */
- gdImageDestroy( pim);
- }
-+
-+ return 0;
- }
-
-
-diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
-index 271ef46..bd8fc27 100755
---- a/src/gd_jpeg.c
-+++ b/src/gd_jpeg.c
-@@ -123,6 +123,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo)
- exit(99);
- }
-
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality);
-+
- /*
- * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
- * QUALITY. If QUALITY is in the range 0-100, increasing values
-@@ -237,8 +239,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageJpegCtx(im, out, quality);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageJpegCtx(im, out, quality)) {
-+ rv = gdDPExtractData(out, size);
-+ } else {
-+ rv = NULL;
-+ }
- out->gd_free(out);
- return rv;
- }
-@@ -259,6 +264,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile);
-
- */
- BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
-+{
-+ _gdImageJpegCtx(im, outfile, quality);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- {
- struct jpeg_compress_struct cinfo;
- struct jpeg_error_mgr jerr;
-@@ -293,7 +304,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- if(row) {
- gdFree(row);
- }
-- return;
-+ return 1;
- }
-
- cinfo.err->emit_message = jpeg_emit_message;
-@@ -334,7 +345,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- if(row == 0) {
- gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n");
- jpeg_destroy_compress(&cinfo);
-- return;
-+ return 1;
- }
-
- rowptr[0] = row;
-@@ -411,6 +422,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- jpeg_finish_compress(&cinfo);
- jpeg_destroy_compress(&cinfo);
- gdFree(row);
-+ return 0;
- }
-
-
-diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c
-index 0028273..341ff6e 100755
---- a/src/gd_wbmp.c
-+++ b/src/gd_wbmp.c
-@@ -88,6 +88,8 @@ int gd_getin(void *in)
- return (gdGetC((gdIOCtx *)in));
- }
-
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);
-+
- /*
- Function: gdImageWBMPCtx
-
-@@ -100,6 +102,12 @@ int gd_getin(void *in)
- out - the stream where to write
- */
- BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
-+{
-+ _gdImageWBMPCtx(image, fg, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- {
- int x, y, pos;
- Wbmp *wbmp;
-@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- /* create the WBMP */
- if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) {
- gd_error("Could not create WBMP\n");
-- return;
-+ return 1;
- }
-
- /* fill up the WBMP structure */
-@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
-
- /* write the WBMP to a gd file descriptor */
- if(writewbmp(wbmp, &gd_putout, out)) {
-+ freewbmp(wbmp);
- gd_error("Could not save WBMP\n");
-+ return 1;
- }
-
- /* des submitted this bugfix: gdFree the memory. */
- freewbmp(wbmp);
-+
-+ return 0;
- }
-
- /*
-@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg)
- void *rv;
- gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- if (out == NULL) return NULL;
-- gdImageWBMPCtx(im, fg, out);
-- rv = gdDPExtractData(out, size);
-+ if (!_gdImageWBMPCtx(im, fg, out)) {
-+ rv = gdDPExtractData(out, size);
-+ } else {
-+ rv = NULL;
-+ }
- out->gd_free(out);
- return rv;
- }
-diff --git a/tests/jpeg/CMakeLists.txt b/tests/jpeg/CMakeLists.txt
-index 19964b0..a8d8162 100755
---- a/tests/jpeg/CMakeLists.txt
-+++ b/tests/jpeg/CMakeLists.txt
-@@ -2,6 +2,7 @@ IF(JPEG_FOUND)
- LIST(APPEND TESTS_FILES
- jpeg_empty_file
- jpeg_im2im
-+ jpeg_ptr_double_free
- jpeg_null
- )
-
-diff --git a/tests/jpeg/Makemodule.am b/tests/jpeg/Makemodule.am
-index 7e5d317..b89e169 100755
---- a/tests/jpeg/Makemodule.am
-+++ b/tests/jpeg/Makemodule.am
-@@ -2,7 +2,8 @@ if HAVE_LIBJPEG
- libgd_test_programs += \
- jpeg/jpeg_empty_file \
- jpeg/jpeg_im2im \
-- jpeg/jpeg_null
-+ jpeg/jpeg_null \
-+ jpeg/jpeg_ptr_double_free
-
- if HAVE_LIBPNG
- libgd_test_programs += \
-diff --git a/tests/jpeg/jpeg_ptr_double_free.c b/tests/jpeg/jpeg_ptr_double_free.c
-new file mode 100644
-index 0000000..c80aeb6
---- /dev/null
-+++ b/tests/jpeg/jpeg_ptr_double_free.c
-@@ -0,0 +1,31 @@
-+/**
-+ * Test that failure to convert to JPEG returns NULL
-+ *
-+ * We are creating an image, set its width to zero, and pass this image to
-+ * `gdImageJpegPtr()` which is supposed to fail, and as such should return NULL.
-+ *
-+ * See also <https://github.com/libgd/libgd/issues/381>
-+ */
-+
-+
-+#include "gd.h"
-+#include "gdtest.h"
-+
-+
-+int main()
-+{
-+ gdImagePtr src, dst;
-+ int size;
-+
-+ src = gdImageCreateTrueColor(1, 10);
-+ gdTestAssert(src != NULL);
-+
-+ src->sx = 0; /* this hack forces gdImageJpegPtr() to fail */
-+
-+ dst = gdImageJpegPtr(src, &size, 0);
-+ gdTestAssert(dst == NULL);
-+
-+ gdImageDestroy(src);
-+
-+ return gdNumFailures();
-+}
-\ No newline at end of file
---
-2.17.1
-
diff --git a/gd-2.2.5-upstream.patch b/gd-2.2.5-upstream.patch
deleted file mode 100644
index 0bc1bcb..0000000
--- a/gd-2.2.5-upstream.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69 at gmx.de>
-Date: Wed, 29 Nov 2017 19:37:38 +0100
-Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx
-
-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.
----
- src/gd_gif_in.c | 12 ++++++------
- tests/gif/.gitignore | 1 +
- tests/gif/CMakeLists.txt | 1 +
- tests/gif/Makemodule.am | 2 ++
- tests/gif/php_bug_75571.c | 28 ++++++++++++++++++++++++++++
- tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes
- 6 files changed, 38 insertions(+), 6 deletions(-)
- create mode 100644 tests/gif/php_bug_75571.c
- create mode 100644 tests/gif/php_bug_75571.gif
-
-diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
-index daf26e79..0a8bd717 100644
---- a/src/gd_gif_in.c
-+++ b/src/gd_gif_in.c
-@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
- 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 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
- }
- }
-
-+ 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-liq.patch b/gd-liq.patch
deleted file mode 100644
index 85d456f..0000000
--- a/gd-liq.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgd-2.2.3/src/gd_topal.c.orig 2016-07-21 10:06:42.000000000 +0200
-+++ libgd-2.2.3/src/gd_topal.c 2016-08-27 21:45:24.911652643 +0200
-@@ -1545,7 +1545,7 @@
- #ifdef HAVE_LIBIMAGEQUANT
- if (oim->paletteQuantizationMethod == GD_QUANT_DEFAULT ||
- oim->paletteQuantizationMethod == GD_QUANT_LIQ) {
-- liq_attr *attr = liq_attr_create_with_allocator(gdMalloc, gdFree);
-+ liq_attr *attr = liq_attr_create(); // not passing gdMalloc/gdFree as allocators: they are just malloc/free, but liq requires 16-byte alignment
- liq_image *image;
- liq_result *remap;
- int remapped_ok = 0;
diff --git a/gd-missing.patch b/gd-missing.patch
new file mode 100644
index 0000000..edf676a
--- /dev/null
+++ b/gd-missing.patch
@@ -0,0 +1,45 @@
+--- libgd-2.3.0/config/getlib.sh.orig 1970-01-01 01:00:00.000000000 +0100
++++ libgd-2.3.0/config/getlib.sh 2020-04-18 21:06:18.162626216 +0200
+@@ -0,0 +1,42 @@
++#!/bin/sh
++
++GETVER="${0%/*}/getver.pl"
++GDLIB_MAJOR=$("${GETVER}" MAJOR)
++GDLIB_MINOR=$("${GETVER}" MINOR)
++GDLIB_REVISION=$("${GETVER}" RELEASE)
++
++# Dynamic library version information
++# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
++
++GDLIB_LT_CURRENT=3
++# This is the version where the soname (current above) changes. We use it
++# to reset the revision base back to zero. It's a bit of a pain, but some
++# systems restrict the revision range below to [0..255] (like OS X).
++GDLIB_PREV_MAJOR=2
++GDLIB_PREV_MINOR=2
++# This isn't 100% correct, but it tends to be a close enough approximation
++# for how we manage the codebase. It's rare to do a release that doesn't
++# modify the library since this project is centered around the library.
++GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
++GDLIB_LT_AGE=0
++
++# The first three fields we feed into libtool and the OS target determines how
++# they get used. The last two fields we feed into cmake. We use the same rules
++# as Linux SONAME versioning in libtool, but cmake should handle it for us.
++case $1 in
++CURRENT)
++ printf '%s' "${GDLIB_LT_CURRENT}"
++ ;;
++REVISION)
++ printf '%s' "${GDLIB_LT_REVISION}"
++ ;;
++AGE)
++ printf '%s' "${GDLIB_LT_AGE}"
++ ;;
++VERSION)
++ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
++ ;;
++SONAME)
++ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
++ ;;
++esac
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gd.git/commitdiff/489009f3896d2b30580d503a0988e2186b6cfc0e
More information about the pld-cvs-commit
mailing list