packages/stb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CVE-2023-45666

Browse Source 
(cherry picked from commit d5c3155e3318bcc7662d90af05369e85574fa3d7)
This commit is contained in:
peijiankang 2024-02-29 09:47:35 +08:00 committed by openeuler-sync-bot
parent 59ff2b98db
commit f21b628a4c
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0002-Fix-possible-double-free-or-memory-leak-in-stbi__loa.patch Normal file
View File

@ -0,0 +1,46 @@
From 33c3c202425daea456520f92846b37da6a83e1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20Loba=C4=8Devski?= <jarlob@github.com>
Date: Thu, 19 Oct 2023 16:29:56 +0200
Subject: [PATCH 2/2] Fix possible double-free or memory leak in
stbi__load_gif_main
Fixes #1548
---
stb_image.h | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/stb_image.h b/stb_image.h
index d3a1f59..df4ff95 100644
--- a/stb_image.h
+++ b/stb_image.h
@@ -6999,8 +6999,11 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y,
return ret;
}
void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride );
- if (!tmp)
- return stbi__load_gif_main_outofmem(&g, out, delays);
+ if (!tmp) {
+ void *ret = stbi__load_gif_main_outofmem(&g, out, delays);
+ if (delays && *delays) *delays = 0;
+ return ret;
+ }
else {
out = (stbi_uc*) tmp;
out_size = layers * stride;
@@ -7019,8 +7022,11 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y,
return ret;
}
out = (stbi_uc*)stbi__malloc( layers * stride );
- if (!out)
- return stbi__load_gif_main_outofmem(&g, out, delays);
+ if (!out) {
+ void *ret = stbi__load_gif_main_outofmem(&g, out, delays);
+ if (delays && *delays) *delays = 0;
+ return ret;
+ }
out_size = layers * stride;
if (delays) {
*delays = (int*) stbi__malloc( layers * sizeof(int) );
--
2.41.0

19
stb.spec
View File

@ -23,7 +23,7 @@ Name: stb
# https://github.com/nothings/stb/issues/1101
%global snapinfo .20220908git8b5f1f3
Version: 0%{snapinfo}
Release: 0.10
Release: 0.11
Summary: Single-file public domain libraries for C/C++
# See LICENSE.
@ -198,6 +198,20 @@ Patch: 1543.patch
# Rebased on top of https://github.com/nothings/stb/pull/1539.
Patch: 0001-Fix-double-free-in-stbi__load_gif_main_outofmem.patch
# Fix possible double-free or memory leak in stbi__load_gif_main
# https://github.com/nothings/stb/pull/1549
#
# Fixes:
#
# Possible double-free or memory leak in stbi__load_gif_main
# (GHSL-2023-150/CVE-2023-45666)
# https://github.com/nothings/stb/issues/1548
#
# Rebased on top of https://github.com/nothings/stb/pull/1539 and
# https://github.com/nothings/stb/pull/1545.
Patch: 0002-Fix-possible-double-free-or-memory-leak-in-stbi__loa.patch
%global stb_c_lexer_version 0.12
%global stb_connected_components_version 0.96
%global stb_divide_version 0.94
@ -953,6 +967,9 @@ EOF
%changelog
* Thu Feb 29 2024 peijiankang <peijiankang@kylinos.cn> - 0.20220908git8b5f1f3-0.11
- stb_image: fix GHSL-2023-150 / fix CVE-2023-45666
* Wed Feb 28 2024 peijiankang <peijiankang@kylinos.cn> - 0.20220908git8b5f1f3-0.10
- stb_image: fix GHSL-2023-146 / fix CVE-2023-45662