mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
tiopex
46
package/freetype/0001-sfnt-Avoid-invalid-face-index.patch
Normal file
46
package/freetype/0001-sfnt-Avoid-invalid-face-index.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
From 818eea8aa682f867e4fbeb9794959a28864e4acc Mon Sep 17 00:00:00 2001
|
||||
From: Werner Lemberg <wl@gnu.org>
|
||||
Date: Thu, 17 Mar 2022 19:24:16 +0100
|
||||
Subject: [PATCH] [sfnt] Avoid invalid face index.
|
||||
|
||||
Fixes #1138.
|
||||
|
||||
* src/sfnt/sfobjs.c (sfnt_init_face), src/sfnt/sfwoff2.c (woff2_open_font):
|
||||
Check `face_index` before decrementing.
|
||||
|
||||
Backport: https://gitlab.freedesktop.org/freetype/freetype/-/commit/53dfdcd8198d2b3201a23c4bad9190519ba918db
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
||||
---
|
||||
src/sfnt/sfobjs.c | 2 +-
|
||||
src/sfnt/sfwoff2.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
|
||||
index 789102479..ea17ca8f4 100644
|
||||
--- a/src/sfnt/sfobjs.c
|
||||
+++ b/src/sfnt/sfobjs.c
|
||||
@@ -566,7 +566,7 @@
|
||||
face_index = FT_ABS( face_instance_index ) & 0xFFFF;
|
||||
|
||||
/* value -(N+1) requests information on index N */
|
||||
- if ( face_instance_index < 0 )
|
||||
+ if ( face_instance_index < 0 && face_index > 0 )
|
||||
face_index--;
|
||||
|
||||
if ( face_index >= face->ttc_header.count )
|
||||
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
|
||||
index 5ee8dea28..2da697d69 100644
|
||||
--- a/src/sfnt/sfwoff2.c
|
||||
+++ b/src/sfnt/sfwoff2.c
|
||||
@@ -2086,7 +2086,7 @@
|
||||
/* Validate requested face index. */
|
||||
*num_faces = woff2.num_fonts;
|
||||
/* value -(N+1) requests information on index N */
|
||||
- if ( *face_instance_index < 0 )
|
||||
+ if ( *face_instance_index < 0 && face_index > 0 )
|
||||
face_index--;
|
||||
|
||||
if ( face_index >= woff2.num_fonts )
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From edbc2be0ccac0d524de82b5f9737d7f070dbf8cd Mon Sep 17 00:00:00 2001
|
||||
From: Werner Lemberg <wl@gnu.org>
|
||||
Date: Sat, 19 Mar 2022 06:40:17 +0100
|
||||
Subject: [PATCH] * src/base/ftobjs.c (ft_open_face_internal): Properly guard
|
||||
`face_index`.
|
||||
|
||||
We must ensure that the cast to `FT_Int` doesn't change the sign.
|
||||
|
||||
Fixes #1139.
|
||||
|
||||
Backport: https://gitlab.freedesktop.org/freetype/freetype/-/commit/22a0cccb4d9d002f33c1ba7a4b36812c7d4f46b5
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
||||
---
|
||||
src/base/ftobjs.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
|
||||
index 883f1a897..e00dcc57b 100644
|
||||
--- a/src/base/ftobjs.c
|
||||
+++ b/src/base/ftobjs.c
|
||||
@@ -2451,6 +2451,15 @@
|
||||
#endif
|
||||
|
||||
|
||||
+ /* only use lower 31 bits together with sign bit */
|
||||
+ if ( face_index > 0 )
|
||||
+ face_index &= 0x7FFFFFFFL;
|
||||
+ else
|
||||
+ {
|
||||
+ face_index &= 0x7FFFFFFFL;
|
||||
+ face_index = -face_index;
|
||||
+ }
|
||||
+
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
FT_TRACE3(( "FT_Open_Face: " ));
|
||||
if ( face_index < 0 )
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From f975217879490247cf8622c65cfef73b5642e787 Mon Sep 17 00:00:00 2001
|
||||
From: Werner Lemberg <wl@gnu.org>
|
||||
Date: Sat, 19 Mar 2022 09:37:28 +0100
|
||||
Subject: [PATCH] * src/base/ftobjs.c (FT_Request_Size): Guard `face->size`.
|
||||
|
||||
Fixes #1140.
|
||||
|
||||
Backport: https://gitlab.freedesktop.org/freetype/freetype/-/commit/0c2bdb01a2e1d24a3e592377a6d0822856e10df2
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
||||
---
|
||||
src/base/ftobjs.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
|
||||
index e00dcc57b..46baf5fed 100644
|
||||
--- a/src/base/ftobjs.c
|
||||
+++ b/src/base/ftobjs.c
|
||||
@@ -3332,6 +3332,9 @@
|
||||
if ( !face )
|
||||
return FT_THROW( Invalid_Face_Handle );
|
||||
|
||||
+ if ( !face->size )
|
||||
+ return FT_THROW( Invalid_Size_Handle );
|
||||
+
|
||||
if ( !req || req->width < 0 || req->height < 0 ||
|
||||
req->type >= FT_SIZE_REQUEST_TYPE_MAX )
|
||||
return FT_THROW( Invalid_Argument );
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.2/
|
||||
md5 7c0d5a39f232d7eb9f9d7da76bf08074 freetype-2.10.2.tar.xz
|
||||
sha1 b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875 freetype-2.10.2.tar.xz
|
||||
# From https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/
|
||||
sha1 86bdc98b37efe447cf53420bf2c18402ff905112 freetype-2.11.1.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b freetype-2.10.2.tar.xz
|
||||
sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT
|
||||
sha256 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 freetype-2.11.1.tar.xz
|
||||
sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT
|
||||
sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT
|
||||
sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT
|
||||
|
||||
@@ -4,16 +4,24 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FREETYPE_VERSION = 2.10.2
|
||||
FREETYPE_VERSION = 2.11.1
|
||||
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz
|
||||
FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype
|
||||
FREETYPE_INSTALL_STAGING = YES
|
||||
FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
|
||||
FREETYPE_LICENSE = Dual FTL/GPL-2.0+
|
||||
FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
|
||||
FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
|
||||
FREETYPE_CPE_ID_VENDOR = freetype
|
||||
FREETYPE_DEPENDENCIES = host-pkgconf
|
||||
FREETYPE_CONFIG_SCRIPTS = freetype-config
|
||||
|
||||
# 0001-sfnt-Avoid-invalid-face-index.patch
|
||||
FREETYPE_IGNORE_CVES += CVE-2022-27404
|
||||
# 0002-src-base-ftobjs.c-ft_open_face_internal-Properly-gua.patch
|
||||
FREETYPE_IGNORE_CVES += CVE-2022-27405
|
||||
# 0003-src-base-ftobjs.c-FT_Request_Size-Guard-face-size.patch
|
||||
FREETYPE_IGNORE_CVES += CVE-2022-27406
|
||||
|
||||
# harfbuzz already depends on freetype so disable harfbuzz in freetype to avoid
|
||||
# a circular dependency
|
||||
FREETYPE_CONF_OPTS = --without-harfbuzz
|
||||
|
||||
Reference in New Issue
Block a user