Mercurial > hg > release > icedtea7-forest-2.5 > jdk

changeset 8229:e8fc101cdb38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8074335: Substitute for substitution formats Reviewed-by: prr, srl, mschoene
author vadim
date Tue, 07 Apr 2015 14:33:49 +0300
parents 0084b6b6623f
children ca52af59c969
files src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp	Tue Apr 07 14:33:53 2015 +0300
+++ b/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp	Tue Apr 07 14:33:49 2015 +0300
@@ -94,7 +94,9 @@
         return 0;
     }
 
-    if (coverageIndex >= 0) {
+    LEReferenceToArrayOf<TTGlyphID> substituteArrayRef(base, success, substituteArray, SWAPW(glyphCount));
+
+    if (coverageIndex >= 0 && LE_SUCCESS(success) && coverageIndex < substituteArrayRef.getCount()) {
         TTGlyphID substitute = SWAPW(substituteArray[coverageIndex]);
 
         if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {