8296854: NULL check of CTFontCopyAvailableTables return value is requ…

…ired Reviewed-by: kcr
openjdk · Dec 7, 2022 · f96b350 · f96b350
1 parent 6f36e70
commit f96b350
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java
@@ -64,6 +64,9 @@ public void decode(String fontName) throws IOException {
                 throw new IOException("Unsupported Dfont");
             }
             int[] tags = DFontDecoder.getCTFontTags(fontRef);
+            if (tags == null) {
+                throw new IOException("Could not get tables for Dfont");
+            }
             short numTables = (short)tags.length;
             int size = TTCHEADERSIZE + (DIRECTORYENTRYSIZE * numTables);
             byte[][] tableData = new byte[numTables][];

diff --git a/modules/javafx.graphics/src/main/native-font/dfontdecoder.c b/modules/javafx.graphics/src/main/native-font/dfontdecoder.c
@@ -117,6 +117,9 @@ JNIEXPORT jintArray JNICALL Java_com_sun_javafx_font_DFontDecoder_getCTFontTags
     CTFontRef fontRef = (CTFontRef)fontPtr;
     CTFontTableOptions  options = kCTFontTableOptionNoOptions;
     CFArrayRef tags = CTFontCopyAvailableTables(fontRef, options);
+    if (tags == NULL) {
+        return NULL;
+    }
     CFIndex count = CFArrayGetCount(tags);
     jintArray intArrObj = (*env)->NewIntArray(env, count);
     if (intArrObj == NULL) {