1 files changed, 7 insertions, 0 deletions
diff --git a/src/psaux/psft.c b/src/psaux/psft.c
index fd09414d8..89e168a94 100644
--- a/src/psaux/psft.c
+++ b/src/psaux/psft.c
@@ -315,6 +315,13 @@
     FT_ASSERT( decoder &&
                ( is_t1 || decoder->cff ) );
 
+    if ( is_t1 && !decoder->current_subfont )
+    {
+      FT_ERROR(( "cf2_decoder_parse_charstrings (Type 1): "
+                 "SubFont missing. Use `t1_make_subfont' first\n" ));
+      return FT_THROW( Invalid_Table );
+    }
+
     memory = decoder->builder.memory;
 
     /* CF2 data is saved here across glyphs */