Attachment 131801 Details for Bug 101348 – Fix as Git commit (obtained with 'git format-patch)

[patch] Fix as Git commit (obtained with 'git format-patch)

0001-fc-lang-gracefully-handle-the-case-where-the-last-la.patch (text/plain), 1.56 KB, created by Florent Rougon on 2017-06-08 13:54:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florent Rougon

Created: 2017-06-08 13:54:35 UTC

Size: 1.56 KB

patch

obsolete

>From a238c2b176b19d61be1a57ebd1e28498136352b2 Mon Sep 17 00:00:00 2001
>From: Florent Rougon <f.rougon@free.fr>
>Date: Tue, 6 Jun 2017 11:10:18 +0200
>Subject: [PATCH] fc-lang: gracefully handle the case where the last language
> initial is < 'z'
>To: fontconfig@lists.freedesktop.org
>
>FcLangSetIndex() contains code like this:
>
>  low = fcLangCharSetRanges[firstChar - 'a'].begin;
>  high = fcLangCharSetRanges[firstChar - 'a'].end;
>  /* no matches */
>  if (low > high)
>
>The assumption behind this test didn't hold before this commit, unless
>there is at least one language name that starts with 'z' (which is
>thankfully the case in our world :-). If the last language name in
>lexicographic order starts for instance with 'x', this change ensures
>that fcLangCharSetRanges['y' - 'a'].begin and
>     fcLangCharSetRanges['z' - 'a'].begin
>are equal to NUM_LANG_CHAR_SET, in order to make the above assumption
>correct in all cases.
>---
> fc-lang/fc-lang.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
>index 38fc697..3443f51 100644
>--- a/fc-lang/fc-lang.c
>+++ b/fc-lang/fc-lang.c
>@@ -561,6 +561,9 @@ main (int argc FC_UNUSED, char **argv)
> 	while (setRangeChar <= c && c <= 'z')
> 	    setRangeStart[setRangeChar++ - 'a'] = i;
>     }
>+    while (setRangeChar <= 'z') /* no language code starts with these letters */
>+	setRangeStart[setRangeChar++ - 'a'] = i;
>+
>     for (setRangeChar = 'a'; setRangeChar < 'z'; setRangeChar++)
> 	setRangeEnd[setRangeChar - 'a'] = setRangeStart[setRangeChar+1-'a'] - 1;
>     setRangeEnd[setRangeChar - 'a'] = i - 1;
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 101348: 131801

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.