suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

native-libs: merge Pango repair for emoji iteration

Browse Source
This commit is contained in:
Matthew Flatt 2018-09-22 20:37:34 -06:00
parent 27bb075113
commit e83ca7a9e5
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
racket/src/native-libs/build.rkt
View File

@ -138,6 +138,9 @@
;; (i.e., auto-find a suitable font) as implemented by `racket/draw`
(define-runtime-path pango-emoji-patch "patches/pango-emoji.patch")
;; Merge a Pango patch that fixes a decoding problem
(define-runtime-path pango-emojiiter-patch "patches/pango-emojiiter.patch")
;; Needed when building with old GCC, such as 4.0:
(define-runtime-path gmp-weak-patch "patches/gmp-weak.patch")
@ -529,7 +532,8 @@
(list coretext-patch
coretext-fontreg-patch
coretext-nullarray
win32text-patch)
win32text-patch
pango-emojiiter-patch)
(if (and mac? m32?)
(list pango-surrogate-patch)
null)

31
racket/src/native-libs/patches/pango-emojiiter.patch Normal file
View File

@ -0,0 +1,31 @@
commit 71aaeaf020340412b8d012fe23a556c0420eda5f
Author: Matthias Clasen <mclasen@redhat.com>
Date: Fri Aug 17 22:29:36 2018 -0400
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.
diff --git a/pango/pango-emoji.c b/pango/pango-emoji.c
index 0e332dff..29472452 100644
--- old/a/pango/pango-emoji.c
+++ new/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;
}
}