nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 53f4acf8: am 3f805418: Merge "Fix an OOB exception" into jb-mr1-dev 

* commit '53f4acf86f6d330146af72f3688ad71428cb8bb6':
  Fix an OOB exception
main
Jean Chalard 2012-08-03 07:22:09 -07:00 committed by Android Git Automerger
parent cc2ae5e24b 53f4acf86f
commit 3695f4be47
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
View File

@ -654,9 +654,12 @@ public class ExpandableDictionary extends Dictionary {
--index; --index;
mLookedUpString[index] = node.mCode; mLookedUpString[index] = node.mCode;
node = node.mParent; node = node.mParent;
} while (node != null); } while (node != null && index > 0);
if (freq >= 0) { // If node is null, we have a word longer than MAX_WORD_LENGTH in the dictionary.
// It's a little unclear how this can happen, but just in case it does it's safer
// to ignore the word in this case.
if (freq >= 0 && node == null) {
suggestions.add(new SuggestedWordInfo(new String(mLookedUpString, index, suggestions.add(new SuggestedWordInfo(new String(mLookedUpString, index,
BinaryDictionary.MAX_WORD_LENGTH - index), BinaryDictionary.MAX_WORD_LENGTH - index),
freq, SuggestedWordInfo.KIND_CORRECTION, mDictType)); freq, SuggestedWordInfo.KIND_CORRECTION, mDictType));