Update to 1.42.4
This commit is contained in:
parent
57163955b5
commit
f1788eb999
@ -1,36 +0,0 @@
|
||||
From 71aaeaf020340412b8d012fe23a556c0420eda5f Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 17 Aug 2018 22:29:36 -0400
|
||||
Subject: [PATCH] Prevent an assertion with invalid Unicode sequences
|
||||
|
||||
Invalid Unicode sequences, such as 0x2665 0xfe0e 0xfe0f,
|
||||
can trick the Emoji iter code into returning an empty
|
||||
segment, which then triggers an assertion in the itemizer.
|
||||
|
||||
Prevent this by ensuring that we make progress.
|
||||
|
||||
This issue was reported by Jeffrey M.
|
||||
---
|
||||
pango/pango-emoji.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/pango/pango-emoji.c b/pango/pango-emoji.c
|
||||
index 0e332dff..29472452 100644
|
||||
--- a/pango/pango-emoji.c
|
||||
+++ b/pango/pango-emoji.c
|
||||
@@ -253,6 +253,12 @@ _pango_emoji_iter_next (PangoEmojiIter *iter)
|
||||
if (iter->is_emoji == PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type))
|
||||
{
|
||||
iter->is_emoji = !PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type);
|
||||
+
|
||||
+ /* Make sure we make progress. Weird sequences, like a VC15 followed
|
||||
+ * by VC16, can trick us into stalling otherwise. */
|
||||
+ if (iter->start == iter->end)
|
||||
+ iter->end = g_utf8_next_char (iter->end);
|
||||
+
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -8,14 +8,13 @@
|
||||
%global fribidi_version 1.0
|
||||
|
||||
Name: pango
|
||||
Version: 1.42.3
|
||||
Release: 2%{?dist}
|
||||
Version: 1.42.4
|
||||
Release: 1%{?dist}
|
||||
Summary: System for layout and rendering of internationalized text
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://www.pango.org
|
||||
Source0: https://download.gnome.org/sources/%{name}/1.42/%{name}-%{version}.tar.xz
|
||||
Patch0: pango-invalid-unicode-sequence-assertion-fix.patch
|
||||
|
||||
BuildRequires: pkgconfig(cairo) >= %{cairo_version}
|
||||
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
|
||||
@ -76,7 +75,6 @@ the functionality of the installed %{name} package.
|
||||
|
||||
%prep
|
||||
%setup -q -n pango-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
@ -130,6 +128,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 20 2018 David King <amigadave@amigadave.com> - 1.42.4-1
|
||||
- Update to 1.42.4
|
||||
|
||||
* Mon Aug 20 2018 David King <amigadave@amigadave.com> - 1.42.3-2
|
||||
- Include a fix for invalid Unicode sequence handling
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user