[type1] Correctly handle missing MM axis names (#46202).

* src/type1/t1load.c (T1_Get_MM_Var): Implement it.
9 years ago · 8539915d18
parent 58b61b6e05
commit 8539915d18
2 changed files with 9 additions and 0 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2015-10-13  Werner Lemberg  <wl@gnu.org>
+
+	[type1] Correctly handle missing MM axis names (#46202).
+
+	* src/type1/t1load.c (T1_Get_MM_Var): Implement it.
+
 2015-10-13  Werner Lemberg  <wl@gnu.org>

 	[pcf] Quickly exit if font index < 0.
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@ -336,6 +336,9 @@
      mmvar->axis[i].strid   = ~0U;                      /* Does not apply */
      mmvar->axis[i].tag     = ~0U;                      /* Does not apply */

+      if ( !mmvar->axis[i].name )
+        continue;
+
      if ( ft_strcmp( mmvar->axis[i].name, "Weight" ) == 0 )
        mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'g', 'h', 't' );
      else if ( ft_strcmp( mmvar->axis[i].name, "Width" ) == 0 )