!59 fix CVE-2025-27363

From: @zppzhangpan 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2025-03-18 06:42:36 +00:00 committed by Gitee
commit f2765f9061
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From 61fdf05f0ed8e2332ee20a44e392a14cf71d2162 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Fri, 14 Mar 2025 12:57:35 -0500
Subject: [PATCH] Fix for CVE-2025-27363 out-of-bound write vulnerability
Resolves: RHEL-83104
Resolves: RHEL-83109
Signed-off-by: Michel Lind <salimma@centosproject.org>
Reference:https://gitlab.com/redhat/centos-stream/rpms/freetype/-/merge_requests/8
Conflict:NA
---
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1944,7 +1944,7 @@
short i, limit;
FT_SubGlyph subglyph;
- FT_Outline outline;
+ FT_Outline outline = { 0, 0, NULL, NULL, NULL, 0 };
FT_Vector* points = NULL;
char* tags = NULL;
short* contours = NULL;
@@ -1953,6 +1953,13 @@
limit = (short)gloader->current.num_subglyphs;
+ /* make sure this isn't negative as we're going to add 4 later */
+ if ( limit < 0 )
+ {
+ error = FT_THROW( Invalid_Argument );
+ goto Exit;
+ }
+
/* construct an outline structure for */
/* communication with `TT_Vary_Apply_Glyph_Deltas' */
outline.n_points = (short)( gloader->current.num_subglyphs + 4 );

View File

@ -4,7 +4,7 @@
Name: freetype
Version: 2.10.2
Release: 5
Release: 6
Summary: FreeType is a freely available software library to render fonts
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
@ -26,6 +26,7 @@ Patch6007: backport-0001-CVE-2022-27405.patch
Patch6008: backport-0002-CVE-2022-27405.patch
Patch6009: backport-CVE-2022-27406.patch
Patch6010: backport-CVE-2023-2004.patch
Patch6011: backport-CVE-2025-27363.patch
BuildRequires: gcc libX11-devel libpng-devel zlib-devel bzip2-devel
@ -74,6 +75,7 @@ popd
%patch6008 -p1
%patch6009 -p1
%patch6010 -p1
%patch6011 -p1
%build
%configure --disable-static --with-zlib=yes --with-bzip2=yes --with-png=yes --enable-freetype-config --with-harfbuzz=no
@ -148,6 +150,9 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co
%{_mandir}/man1/*
%changelog
* Tue Mar 18 2025 zhangpan <zhangpan103@h-partners.com> - 2.10.2-6
- fix CVE-2025-27363
* Mon Apr 17 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.10.2-5
- fix CVE-2023-2004