8273748: Improve Solaris font rendering

Reviewed-by: yan, andrew
openjdk · Jan 6, 2022 · 740c50b · 740c50b
1 parent f9d9c29
commit 740c50b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp b/jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp
@@ -49,6 +49,11 @@ ContextualGlyphSubstitutionProcessor2::ContextualGlyphSubstitutionProcessor2(
 {
     if(LE_FAILURE(success)) return;
     le_uint32 perGlyphTableOffset = SWAPL(contextualGlyphHeader->perGlyphTableOffset);
+    if (perGlyphTableOffset & 0x03) { // incorrect alignment for 32 bit tables
+        LE_DEBUG_BAD_FONT("perGlyphTableOffset: incorrect alignment");
+        success = LE_MEMORY_ALLOCATION_ERROR;
+        return;
+    }
     perGlyphTable = LEReferenceToArrayOf<le_uint32> (stHeader, success, perGlyphTableOffset, LE_UNBOUNDED_ARRAY);
     entryTable = LEReferenceToArrayOf<ContextualGlyphStateEntry2>(stHeader, success, entryTableOffset, LE_UNBOUNDED_ARRAY);
 }