gd: bump to version 2.1.1
Also add hash file. Remove CVE patch since it's upstream. Rename patches to new naming convention. Kill some whitespace. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
a1f672bfa8
commit
691fc0a198
@ -1,33 +0,0 @@
|
||||
From 463c3bd09bfe8e924e19acad7a2a6af16953a704 Mon Sep 17 00:00:00 2001
|
||||
From: Remi Collet <fedora@famillecollet.com>
|
||||
Date: Mon, 4 Aug 2014 10:31:25 +0200
|
||||
Subject: [PATCH] CVE-2014-2497, NULL pointer dereference, fix #126
|
||||
|
||||
---
|
||||
src/gdxpm.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/gdxpm.c b/src/gdxpm.c
|
||||
index ae6e336..15603a6 100644
|
||||
--- a/src/gdxpm.c
|
||||
+++ b/src/gdxpm.c
|
||||
@@ -83,6 +83,16 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXpm(char *filename)
|
||||
if(overflow2(sizeof(int), number)) {
|
||||
goto done;
|
||||
}
|
||||
+ for(i = 0; i < number; i++) {
|
||||
+ /*
|
||||
+ avoid NULL pointer dereference
|
||||
+ TODO better fix need to manage monochrome/monovisual
|
||||
+ see m_color or g4_color or g_color
|
||||
+ */
|
||||
+ if (!image.colorTable[i].c_color) {
|
||||
+ goto done;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
colors = (int *)gdMalloc(sizeof(int) * number);
|
||||
if(colors == NULL) {
|
||||
--
|
||||
1.8.5.2
|
||||
|
2
package/gd/gd.hash
Normal file
2
package/gd/gd.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285 libgd-2.1.1.tar.xz
|
@ -4,13 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GD_VERSION = 2.1.0
|
||||
GD_VERSION = 2.1.1
|
||||
GD_SOURCE = libgd-$(GD_VERSION).tar.xz
|
||||
GD_SITE = https://bitbucket.org/libgd/gd-libgd/downloads
|
||||
GD_INSTALL_STAGING = YES
|
||||
GD_LICENSE = GD license
|
||||
GD_LICENSE_FILES = COPYING
|
||||
|
||||
GD_CONFIG_SCRIPTS = gdlib-config
|
||||
GD_CONF_OPTS = --without-x --disable-rpath
|
||||
GD_DEPENDENCIES = host-pkgconf
|
||||
|
Loading…
Reference in New Issue
Block a user