Merge "Strengthen java code against bad returns from native"

2012-03-21 00:54:25 -07:00 · 2012-03-21 00:54:25 -07:00 · f5f53c2fa6
parent 140467b8b6 6ca3ac08ed
commit f5f53c2fa6
1 changed files with 3 additions and 0 deletions
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@ -149,6 +149,9 @@ public class BinaryDictionary extends Dictionary {
        int count = getBigramsNative(mNativeDict, chars, chars.length, mInputCodes, codesSize,
                mOutputChars_bigrams, mBigramScores, MAX_WORD_LENGTH, MAX_BIGRAMS,
                MAX_PROXIMITY_CHARS_SIZE);
+        if (count > MAX_BIGRAMS) {
+            count = MAX_BIGRAMS;
+        }

        for (int j = 0; j < count; ++j) {
            if (codesSize > 0 && mBigramScores[j] < 1) break;