mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-22 03:13:52 +00:00
gd: upgrade v2.3.2 -> v2.3.3
Changes: i) removed patches contained in newer version ii) LIC_FILES_CHKSUM changed because of the following commits: 6013c7bc Just make it easier for the doc 82d26095 merge duplicate COPYING files Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
965b85b678
commit
3f8d565e39
@ -1,33 +0,0 @@
|
||||
From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001
|
||||
From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu>
|
||||
Date: Mon, 19 Jul 2021 10:07:13 +0430
|
||||
Subject: [PATCH] fix read out-of-bands in reading tga header file
|
||||
|
||||
CVE: CVE-2021-38115
|
||||
Upstream-Status: Backport [8b111b2b4a4842179be66db68d84dda91a246032]
|
||||
|
||||
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
|
||||
---
|
||||
src/gd_tga.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gd_tga.c b/src/gd_tga.c
|
||||
index cae9428..286febb 100644
|
||||
--- a/src/gd_tga.c
|
||||
+++ b/src/gd_tga.c
|
||||
@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga)
|
||||
return -1;
|
||||
}
|
||||
|
||||
- gdGetBuf(tga->ident, tga->identsize, ctx);
|
||||
+
|
||||
+ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) {
|
||||
+ gd_error("fail to read header ident");
|
||||
+ return -1;
|
||||
+ }
|
||||
}
|
||||
|
||||
return 1;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -9,15 +9,14 @@ HOMEPAGE = "http://libgd.github.io/"
|
||||
|
||||
SECTION = "libs"
|
||||
LICENSE = "GD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1"
|
||||
|
||||
DEPENDS = "freetype libpng jpeg zlib tiff"
|
||||
|
||||
SRC_URI = "git://github.com/libgd/libgd.git;branch=master \
|
||||
file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \
|
||||
SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1 \
|
||||
"
|
||||
|
||||
SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e"
|
||||
SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user