shithub: freetype+ttf2subf

Download patch

ref: 90e437e3cdf0710b5c9b6197b95a58d594312626
parent: feb1f138b7463e9d7c4ee95016c958d8de65a75a
author: Werner Lemberg <[email protected]>
date: Thu Oct 1 16:00:27 EDT 2015 

[sfnt] Make `tt_cmap4_char_map_linear' more robust (#46078).

* src/sfnt/ttcmap.c (tt_cmap4_char_map_linear): Take care of
border conditions (i.e., if the loop exits naturally).

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2015-10-01  Werner Lemberg  <[email protected]>
 
+	[sfnt] Make `tt_cmap4_char_map_linear' more robust (#46078).
+
+	* src/sfnt/ttcmap.c (tt_cmap4_char_map_linear): Take care of
+	border conditions (i.e., if the loop exits naturally).
+
+2015-10-01  Werner Lemberg  <[email protected]>
+
 	* src/autofit/afranges.c (af_deva_nonbase_uniranges): Fix ranges.
 	They should be a subset of `af_deva_uniranges'.
 
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -1130,18 +1130,16 @@
             /* we have an invalid glyph index; if there is an overflow, */
             /* we can adjust `charcode', otherwise the whole segment is */
             /* invalid                                                  */
+            gindex = 0;
+
             if ( (FT_Int)charcode + delta < 0 &&
                  (FT_Int)end + delta >= 0     )
-            {
               charcode = (FT_UInt)( -delta );
-              gindex   = 0;
-            }
+
             else if ( (FT_Int)charcode + delta < 0x10000L &&
                       (FT_Int)end + delta >= 0x10000L     )
-            {
               charcode = (FT_UInt)( 0x10000L - delta );
-              gindex   = 0;
-            }
+
             else
               continue;
           }