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

Avoid returning an object that's still used internally

Browse source 
There is no definite path known for this to end up being
touched by other classes, but we could imagine through
some way or some other it ends up shoved in the stringbuilder
pool, leading to catastrophic results.

Hopefully related to
Bug: 5248688

Change-Id: Ib8abfc31263cbf31d515ed607ced5d8253971938
This commit is contained in:
Jean Chalard 2011-09-15 15:42:21 +09:00
parent fa52a09f21
commit 5c08151c22
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/Suggest.java
View file

@ -306,12 +306,10 @@ public class Suggest implements Dictionary.WordCallback {
Arrays.fill(mScores, 0); Arrays.fill(mScores, 0);
// Save a lowercase version of the original word // Save a lowercase version of the original word
CharSequence typedWord = wordComposer.getTypedWord(); String typedWord = wordComposer.getTypedWord();
if (typedWord != null) { if (typedWord != null) {
final String typedWordString = typedWord.toString();
typedWord = typedWordString;
// Treating USER_TYPED as UNIGRAM suggestion for logging now. // Treating USER_TYPED as UNIGRAM suggestion for logging now.
LatinImeLogger.onAddSuggestedWord(typedWordString, Suggest.DIC_USER_TYPED, LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED,
Dictionary.DataType.UNIGRAM); Dictionary.DataType.UNIGRAM);
} }
mTypedWord = typedWord; mTypedWord = typedWord;

4
java/src/com/android/inputmethod/latin/WordComposer.java
View file

@ -164,11 +164,11 @@ public class WordComposer {
* Returns the word as it was typed, without any correction applied. * Returns the word as it was typed, without any correction applied.
* @return the word that was typed so far * @return the word that was typed so far
*/ */
public CharSequence getTypedWord() { public String getTypedWord() {
if (size() == 0) { if (size() == 0) {
return null; return null;
} }
return mTypedWord; return mTypedWord.toString();
} }
/** /**