summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2018-07-01 12:31:57 +0200
committerWerner Lemberg <wl@gnu.org>2018-07-01 12:31:57 +0200
commitf6ccb524af9b7d136f32426362558525b537817c (patch)
tree5cefad8a07442318a79f1ac51eeac334de8e1e81
parent1fc776b5f14e2be6fa3d6573f5cd3fb88a7ae468 (diff)
downloadfreetype2-f6ccb524af9b7d136f32426362558525b537817c.tar.gz
* src/base/ftobjs.c (FT_Get_Color_Glyph_Layer): Guard SFNT function.
Reported by Behdad.
-rw-r--r--ChangeLog6
-rw-r--r--src/base/ftobjs.c15
2 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e23cc967a..dd5738811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-01 Werner Lemberg <wl@gnu.org>
+
+ * src/base/ftobjs.c (FT_Get_Color_Glyph_Layer): Guard SFNT function.
+
+ Reported by Behdad.
+
2018-06-28 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/fttrigon.c (FT_Tan): Improve accuracy.
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;
+ }
}