!58 Update to 8.3.0

From: @dedv_dwe 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
This commit is contained in:
openeuler-ci-bot 2023-11-22 07:04:43 +00:00 committed by Gitee
commit 54f90bf4e7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 5 additions and 34 deletions

View File

@ -1,31 +0,0 @@
From 85be877925ddbf34f74a1229f3ca1716bb6170dc Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 1 Feb 2023 20:00:43 -0700
Subject: [PATCH] [layout] Limit how far we skip when looking back
See comments.
---
src/hb-ot-layout-gsubgpos.hh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index bf74672a1..8ca691805 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -578,6 +578,13 @@ struct hb_ot_apply_context_t :
unsigned stop = num_items - 1;
if (c->buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT)
stop = 1 - 1;
+
+ /* When looking back, limit how far we search; this function is mostly
+ * used for looking back for base glyphs when attaching marks. If we
+ * don't limit, we can get O(n^2) behavior where n is the number of
+ * consecutive marks. */
+ stop = (unsigned) hb_max ((int) stop, (int) idx - HB_MAX_CONTEXT_LENGTH);
+
while (idx > stop)
{
idx--;
--
2.20.1

View File

@ -1,13 +1,11 @@
Name: harfbuzz
Version: 6.0.0
Version: 8.3.0
Release: 1
Summary: A text shaping engine
License: MIT
URL: https://harfbuzz.github.io/
Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz
Patch0001: backport-CVE-2023-25193.patch
BuildRequires: gcc-c++ freetype-devel cairo-devel glib2-devel graphite2-devel
BuildRequires: gtk-doc libicu-devel gobject-introspection-devel make
Provides: harfbuzz-icu
@ -55,6 +53,7 @@ make check
%{_libdir}/libharfbuzz-icu.so.*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/HarfBuzz-0.0.typelib
%{_libdir}/libharfbuzz-cairo.so.0*
%files devel
%{_bindir}/*
@ -70,6 +69,9 @@ make check
%{_datadir}/gtk-doc/html/harfbuzz/*
%changelog
* Wed Nov 22 2023 wangqia <wangqia@uniontech.com> - 8.3.0-1
- Update to 8.3.0
* Wed Feb 22 2023 liweiganga <liweiganga@uniontech.com> - 6.0.0-1
- upstream to 6.0.0