summaryrefslogtreecommitdiffstats
path: root/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2017-09-07 16:45:51 +0200
committerPeter Korsgaard <peter@korsgaard.com>2017-09-08 11:13:57 +0200
commit3b85d24c1d927590ed3a336794562e9a512fc216 (patch)
treea383f07f5182b9b80680b00f43c95e5adbb6b987 /package/gd/0002-gd_bmp-fix-build-with-uClibc.patch
parentf396d1310b630c8d2307f505ec95a17d27d29f23 (diff)
downloadbuildroot-3b85d24c1d927590ed3a336794562e9a512fc216.tar.gz
buildroot-3b85d24c1d927590ed3a336794562e9a512fc216.zip
gd: security bump to version 2.2.5
Fixes the following security issues: CVE-2017-6362: Double-free in gdImagePngPtr() CVE-2017-7890: Buffer over-read into uninitialized memory Drop patches no more needed: 0001-gdlib-config.patch: @LIBICONV@ is nowadays correct AC_SUBST'ed by configure 0002-gd_bmp-fix-build-with-uClibc.patch: upstream uses ceil() since https://github.com/libgd/libgd/commit/6913dd3cd2a7c2914ad9622419f9343bfe956135 While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/gd/0002-gd_bmp-fix-build-with-uClibc.patch')
-rw-r--r--package/gd/0002-gd_bmp-fix-build-with-uClibc.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch b/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch
deleted file mode 100644
index 89bc39186e..0000000000
--- a/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ea2a03e983acf34a1320b460dcad43b7e0b0b14f Mon Sep 17 00:00:00 2001
-Message-Id: <ea2a03e983acf34a1320b460dcad43b7e0b0b14f.1397134306.git.baruch@tkos.co.il>
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 10 Apr 2014 15:49:13 +0300
-Subject: [PATCH] gd_bmp: fix build with uClibc
-
-Some architectures (like ARM) don't have the long double variants of math
-functions under uClibc. Add a local ceill definition in this case.
-
-Patch status: reported upstream,
-https://bitbucket.org/libgd/gd-libgd/issue/123/build-failure-agains-uclibc-arm
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- src/gd_bmp.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/gd_bmp.c b/src/gd_bmp.c
-index 0fc021909f1b..11b3ec1baa01 100644
---- a/src/gd_bmp.c
-+++ b/src/gd_bmp.c
-@@ -25,6 +25,11 @@
- #include "gdhelpers.h"
- #include "bmp.h"
-
-+#include <features.h>
-+#if defined (__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__)
-+#define NO_LONG_DOUBLE
-+#endif
-+
- static int compress_row(unsigned char *uncompressed_row, int length);
- static int build_rle_packet(unsigned char *row, int packet_type, int length, unsigned char *data);
-
-@@ -42,6 +47,13 @@ static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info);
-
- #define BMP_DEBUG(s)
-
-+#ifdef NO_LONG_DOUBLE
-+long double ceill(long double x)
-+{
-+ return (long double) ceil((double) x);
-+}
-+#endif
-+
- static int gdBMPPutWord(gdIOCtx *out, int w)
- {
- /* Byte order is little-endian */
---
-1.9.1
-
OpenPOWER on IntegriCloud