# HG changeset patch
# User prr
# Date 1421344026 28800
# Node ID b2a9675e2e21cfac9be419f2da4bf1e0590d9a61
# Parent  6691760b847eadca9dea014ec522e6c91f47dd29
8067699: Better glyph storage
Reviewed-by: srl, bae, mschoene

diff -r 6691760b847e -r b2a9675e2e21 jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp
--- a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp	Wed Jan 07 13:10:00 2015 -0800
+++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp	Thu Jan 15 09:47:06 2015 -0800
@@ -115,7 +115,7 @@
                   LE_DEBUG_BAD_FONT("off end of ligature substitution header");
                   return newState; // get out! bad font
               }
-              if(componentGlyph > glyphStorage.getGlyphCount()) {
+              if(componentGlyph >= glyphStorage.getGlyphCount()) {
                 LE_DEBUG_BAD_FONT("preposterous componentGlyph");
                 currGlyph++;
                 return newState; // get out! bad font
diff -r 6691760b847e -r b2a9675e2e21 jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp
--- a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp	Wed Jan 07 13:10:00 2015 -0800
+++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp	Thu Jan 15 09:47:06 2015 -0800
@@ -119,7 +119,7 @@
 
             offset = action & lafComponentOffsetMask;
             if (offset != 0) {
-                if(componentGlyph > glyphStorage.getGlyphCount()) {
+                if(componentGlyph >= glyphStorage.getGlyphCount()) {
                   LE_DEBUG_BAD_FONT("preposterous componentGlyph");
                   currGlyph+= dir;
                   return nextStateIndex; // get out! bad font