Merge "Strengthen java code against bad returns from native"

main
Jean Chalard 2012-03-21 00:54:25 -07:00 committed by Android (Google) Code Review
commit f5f53c2fa6
1 changed files with 3 additions and 0 deletions

View File

@ -149,6 +149,9 @@ public class BinaryDictionary extends Dictionary {
int count = getBigramsNative(mNativeDict, chars, chars.length, mInputCodes, codesSize, int count = getBigramsNative(mNativeDict, chars, chars.length, mInputCodes, codesSize,
mOutputChars_bigrams, mBigramScores, MAX_WORD_LENGTH, MAX_BIGRAMS, mOutputChars_bigrams, mBigramScores, MAX_WORD_LENGTH, MAX_BIGRAMS,
MAX_PROXIMITY_CHARS_SIZE); MAX_PROXIMITY_CHARS_SIZE);
if (count > MAX_BIGRAMS) {
count = MAX_BIGRAMS;
}
for (int j = 0; j < count; ++j) { for (int j = 0; j < count; ++j) {
if (codesSize > 0 && mBigramScores[j] < 1) break; if (codesSize > 0 && mBigramScores[j] < 1) break;