TTFont: Handle null result of _glyf.getDescription(i)

1 files changed, 11 insertions, 5 deletions

diff --git a/src/main/java/net/java/dev/typecast/ot/TTFont.java b/src/main/java/net/java/dev/typecast/ot/TTFont.java
index 4505f1b..c8ac6bd 100644
--- a/src/main/java/net/java/dev/typecast/ot/TTFont.java
+++ b/src/main/java/net/java/dev/typecast/ot/TTFont.java
@@ -164,11 +164,17 @@ public class TTFont extends OTFont {
         return _vdmx;
     }
 
-    public Glyph getGlyph(int i) {
-        return new TTGlyph(
-                _glyf.getDescription(i),
-                getHmtxTable().getLeftSideBearing(i),
-                getHmtxTable().getAdvanceWidth(i));
+    @Override
+    public Glyph getGlyph(final int i) {
+        final GlyfDescript glyfDescr = _glyf.getDescription(i);
+        if( null != glyfDescr ) {
+            return new TTGlyph(
+                    glyfDescr,
+                    getHmtxTable().getLeftSideBearing(i),
+                    getHmtxTable().getAdvanceWidth(i));
+        } else {
+            return null;
+        }
     }
 
 }