gd/patches/gd-2.2.4-upstream.patch

From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 18 Jan 2017 13:59:02 +0100
Subject: [PATCH] Fix build issue regarding INT_MAX

For portability gd_gd2.c needs to include <limits.h>.
---
 src/gd_gd2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gd_gd2.c b/src/gd_gd2.c
index c2904ca..049c4c5 100644
--- a/src/gd_gd2.c
+++ b/src/gd_gd2.c
@@ -74,6 +74,7 @@
 
 /* 2.0.29: no more errno.h, makes windows happy */
 #include <math.h>
+#include <limits.h>
 #include <string.h>
 #include "gd.h"
 #include "gd_errors.h"


From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Thu, 19 Jan 2017 01:02:58 +0100
Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite.

We make sure to never pass a negative `int` as argument to a `size_t`
parameter.
---
 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 eda2eeb..cb38794 100644
--- a/src/gd_io_dp.c
+++ b/src/gd_io_dp.c
@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
 		rlen = dp->realSize - dp->pos;
 	}
 
+	if (rlen < 0) {
+		return 0;
+	}
+
 	memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen);
 	dp->pos += rlen;
 
1	From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001
2	From: "Christoph M. Becker" <cmbecker69@gmx.de>
3	Date: Wed, 18 Jan 2017 13:59:02 +0100
4	Subject: [PATCH] Fix build issue regarding INT_MAX
5
6	For portability gd_gd2.c needs to include <limits.h>.
7	---
8	src/gd_gd2.c \| 1 +
9	1 file changed, 1 insertion(+)
10
11	diff --git a/src/gd_gd2.c b/src/gd_gd2.c
12	index c2904ca..049c4c5 100644
13	--- a/src/gd_gd2.c
14	+++ b/src/gd_gd2.c
15	@@ -74,6 +74,7 @@
16
17	/* 2.0.29: no more errno.h, makes windows happy */
18	#include <math.h>
19	+#include <limits.h>
20	#include <string.h>
21	#include "gd.h"
22	#include "gd_errors.h"
23
24
25	From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001
26	From: "Christoph M. Becker" <cmbecker69@gmx.de>
27	Date: Thu, 19 Jan 2017 01:02:58 +0100
28	Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite.
29
30	We make sure to never pass a negative `int` as argument to a `size_t`
31	parameter.
32	---
33	src/gd_io_dp.c \| 4 ++++
34	1 file changed, 4 insertions(+)
35
36	diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
37	index eda2eeb..cb38794 100644
38	--- a/src/gd_io_dp.c
39	+++ b/src/gd_io_dp.c
40	@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
41	rlen = dp->realSize - dp->pos;
42	}
43
44	+ if (rlen < 0) {
45	+ return 0;
46	+ }
47	+
48	memcpy(buf, (void ) ((char )dp->data + dp->pos), rlen);
49	dp->pos += rlen;
50