commit f5f53c2fa610fd9ea4588fd7c8c6fc3f36b9247a
author Jean Chalard <jchalard@google.com> Wed Mar 21 00:54:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 21 00:54:25 2012 -0700
tree a9b5cbf27ca3ea01a20948bbd421afba8e33be90
parent 140467b8b65eb9087a9b7f744dbb8a30481effe7
parent 6ca3ac08ed536c415ac68913e23fde175b5e3f4d

Merge "Strengthen java code against bad returns from native"

java/src/com/android/inputmethod/latin/BinaryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 31ff4e7..dfc8c8e 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -149,6 +149,9 @@
         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;