[freetype2] master e669959: [truetype] Fix MVAR post-action handling.

[Werner LEMBERG]

branch: master
commit e6699596af5c5d6f0ae0ea06e19df87dce088df8
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [truetype] Fix MVAR post-action handling.
    
    Reported as
    
      https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=509
    
    * src/truetype/ttobjs.c (tt_size_reset): Do nothing for CFF2.  This
    is important to make `tt_size_reset_iterator' (called in
    `tt_apply_mvar') always work.
---
 ChangeLog             |   12 ++++++++++++
 src/truetype/ttobjs.c |    8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b9c42b..bec432e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2017-02-02  Werner Lemberg  <address@hidden>
 
+       [truetype] Fix MVAR post-action handling.
+
+       Reported as
+
+         https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=509
+
+       * src/truetype/ttobjs.c (tt_size_reset): Do nothing for CFF2.  This
+       is important to make `tt_size_reset_iterator' (called in
+       `tt_apply_mvar') always work.
+
+2017-02-02  Werner Lemberg  <address@hidden>
+
        Make compilation with FT_CONFIG_OPTION_PIC work again.
 
        All code committed here is guarded with `FT_CONFIG_OPTION_PIC'.
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 18aa48a..00207bb 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -1212,10 +1212,14 @@
     FT_Size_Metrics*  metrics;
 
 
-    size->ttmetrics.valid = FALSE;
-
     face = (TT_Face)size->root.face;
 
+    /* nothing to do for CFF2 */
+    if ( face->isCFF2 )
+      return FT_Err_Ok;
+
+    size->ttmetrics.valid = FALSE;
+
     metrics = &size->metrics;
 
     /* copy the result from base layer */