add guards for h->otl == NULL before calling otlSubtableAdd

Testing in macOS 13.x revealed that there was no check for h->otl == NULL before calling otlSubtableAdd, which accesses h->otl in GPOSFill and GSUBFill routines. Without this check, otlSubtableAdd would fail with a segfault when h->otl was passed in NULL.
adobe-type-tools · Sep 29, 2023 · fca1212 · fca1212
1 parent 6bbd056
commit fca1212
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/c/makeotf/lib/hotconv/GPOS.c b/c/makeotf/lib/hotconv/GPOS.c
@@ -379,6 +379,10 @@ int GPOSFill(hotCtx g) {
 
     createAnonLookups(g, h);
 
+    if (h->otl == NULL) {
+        return 0;
+    }
+
     /* Add OTL features */
     /* See GSUB.c::GSUBFill() for an explanation of the subtable order */
 

diff --git a/c/makeotf/lib/hotconv/GSUB.c b/c/makeotf/lib/hotconv/GSUB.c
@@ -217,6 +217,10 @@ int GSUBFill(hotCtx g) {
 
     createAnonLookups(g, h);
 
+    if (h->otl == NULL) {
+        return 0;
+    }
+
     /* Add OTL features */
 
     /* The font tables are in the order: