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

am eb501f26: am ed471316: Merge "Fix a bug with surrogate characters" into jb-mr1-dev 

* commit 'eb501f26c1615b4e0572767f85faa3ec0636a21b':
  Fix a bug with surrogate characters
main
Jean Chalard 2012-09-18 02:11:24 -07:00 committed by Android Git Automerger
parent 780bc96c9f eb501f26c1
commit 23af2a47bd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java
View File

@ -556,6 +556,7 @@ public class FusionDictionary implements Iterable<Word> {
final StringBuilder checker = DBG ? new StringBuilder() : null; final StringBuilder checker = DBG ? new StringBuilder() : null;
CharGroup currentGroup; CharGroup currentGroup;
final int codePointCountInS = s.codePointCount(0, s.length());
do { do {
int indexOfGroup = findIndexOfChar(node, s.codePointAt(index)); int indexOfGroup = findIndexOfChar(node, s.codePointAt(index));
if (CHARACTER_NOT_FOUND == indexOfGroup) return null; if (CHARACTER_NOT_FOUND == indexOfGroup) return null;
@ -570,12 +571,12 @@ public class FusionDictionary implements Iterable<Word> {
index = newIndex; index = newIndex;
if (DBG) checker.append(new String(currentGroup.mChars, 0, currentGroup.mChars.length)); if (DBG) checker.append(new String(currentGroup.mChars, 0, currentGroup.mChars.length));
if (index < s.length()) { if (index < codePointCountInS) {
node = currentGroup.mChildren; node = currentGroup.mChildren;
} }
} while (null != node && index < s.length()); } while (null != node && index < codePointCountInS);
if (index < s.length()) return null; if (index < codePointCountInS) return null;
if (!currentGroup.isTerminal()) return null; if (!currentGroup.isTerminal()) return null;
if (DBG && !s.equals(checker.toString())) return null; if (DBG && !s.equals(checker.toString())) return null;
return currentGroup; return currentGroup;