src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp

rev 16300 : 8170798: Fix minor issues in java2d and sound coding.
Reviewed-by: prr, serb

@@ -300,11 +300,11 @@
     for (inputIndex = 0; inputIndex < charCount; inputIndex += 1) {
         LEUnicode ch = input[inputIndex + offset];
         le_uint8 charClass;
 
         // Decompose SARA AM into NIKHAHIT + SARA AA
-        if (ch == CH_SARA_AM && isLegalHere(ch, state)) {
+        if (ch == CH_SARA_AM && isLegalHere(ch, state) && conState < stateCount) {
             outputIndex = conOutput;
             state = getNextState(CH_NIKHAHIT, conState, inputIndex, glyphSet, errorChar, charClass,
                 output, glyphStorage, outputIndex);
 
             for (int j = conInput + 1; j < inputIndex; j += 1) {