commit f3109f39cc383de14af5b1ea826eec3568711133
author prr <none@none> Thu Jan 15 09:50:52 2015 -0800
committer prr <none@none> Thu Jan 15 09:50:52 2015 -0800
tree 28b4d9a9eb215dd3ad8c2c6553875c645d61c174
parent 3b4e1cb37edf85cbffebadb7a0808545d8716282

8067699: Better glyph storage
Reviewed-by: srl, bae, mschoene

src/share/native/sun/font/layout/LigatureSubstProc.cpp

diff --git a/src/share/native/sun/font/layout/LigatureSubstProc.cpp b/src/share/native/sun/font/layout/LigatureSubstProc.cpp
index 0014b95..99e9e37 100644
--- a/src/share/native/sun/font/layout/LigatureSubstProc.cpp
+++ b/src/share/native/sun/font/layout/LigatureSubstProc.cpp
@@ -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

src/share/native/sun/font/layout/LigatureSubstProc2.cpp

diff --git a/src/share/native/sun/font/layout/LigatureSubstProc2.cpp b/src/share/native/sun/font/layout/LigatureSubstProc2.cpp
index 8e5b1cf..558cf8b 100644
--- a/src/share/native/sun/font/layout/LigatureSubstProc2.cpp
+++ b/src/share/native/sun/font/layout/LigatureSubstProc2.cpp
@@ -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