Re: [ft-devel] Fwd: completed CPAL/COLR support

[Werner LEMBERG]

> Running in gdb and valgrind both points to the same stacktrace I
> sent.  Inspecting in gdb, sfnt->get_colr_layer is NULL but called on
> ftobjs.c:5496

Doh, thanks.  Fix is trivial, but I don't have access to git right now
(the WLAN in the small pension apparently blocks port 22, something
I've never experienced before).


    Werner


======================================================================


diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index baaeaff98..fa58768e6 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;
+    }
   }