* src/truetype/ttgload.c (load_truetype_glyph)

[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Fix crash for composite glyphs having a depth greater than 1.
10 years ago · 8dfc760161
parent ca6a5cf4b8
commit 8dfc760161
2 changed files with 8 additions and 2 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2015-08-03  Werner Lemberg  <wl@gnu.org>
+
+	* src/truetype/ttgload.c (load_truetype_glyph)
+	[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Fix crash for composite glyphs
+	having a depth greater than 1.
+
 2015-08-03  Werner Lemberg  <wl@gnu.org>

 	Fix typo in clang bug from 2015-07-31 (#45678).
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@ -1702,7 +1702,7 @@
             FT_NEW_ARRAY( contours, outline.n_points ) )
          goto Exit1;

-        subglyph = gloader->current.subglyphs + gloader->base.num_subglyphs;
+        subglyph = gloader->current.subglyphs;

        for ( i = 0; i < limit; i++, subglyph++ )
        {
@ -1751,7 +1751,7 @@
                         (FT_UInt)outline.n_points ) ) != 0 )
          goto Exit1;

-        subglyph = gloader->current.subglyphs + gloader->base.num_subglyphs;
+        subglyph = gloader->current.subglyphs;

        for ( i = 0; i < limit; i++, subglyph++ )
        {