[freetype2] master f6ccb52: * src/base/ftobjs.c (FT_Get_Color_Glyph_Layer): Guard SFNT function.

[Werner LEMBERG]

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

    * src/base/ftobjs.c (FT_Get_Color_Glyph_Layer): Guard SFNT function.
    
    Reported by Behdad.
---
 ChangeLog         |  6 ++++++
 src/base/ftobjs.c | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e23cc96..dd57388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-01  Werner Lemberg  <address@hidden>
+
+       * src/base/ftobjs.c (FT_Get_Color_Glyph_Layer): Guard SFNT function.
+
+       Reported by Behdad.
+
 2018-06-28  Alexei Podtelezhnikov  <address@hidden>
 
        * src/base/fttrigon.c (FT_Tan): Improve accuracy.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index baaeaff..fa58768 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -5493,10 +5493,17 @@
     ttface = (TT_Face)face;
     sfnt   = (SFNT_Service)ttface->sfnt;
 
-    return sfnt->get_colr_layer( ttface,
-                                 base_glyph,
-                                 acolor_index,
-                                 iterator );
+    if ( sfnt->get_colr_layer )
+      return sfnt->get_colr_layer( ttface,
+                                   base_glyph,
+                                   acolor_index,
+                                   iterator );
+    else
+    {
+      *acolor_index = 0;
+
+      return 0;
+    }
   }