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

am 7f14894f: Merge "Fix: wrong bigram entry pos can be used during GC."

Browse source 
* commit '7f14894f2f38f8dade230c53dd5a1410c40f7e0d':
  Fix: wrong bigram entry pos can be used during GC.
This commit is contained in:
Keisuke Kuroyanagi 2014-07-09 03:09:37 +00:00 committed by Android Git Automerger
commit fd0a722758
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp
View file

@ -175,9 +175,9 @@ bool Ver4BigramListPolicy::updateAllBigramEntriesAndDeleteUselessEntries(const i
bool hasNext = true; bool hasNext = true;
int readingPos = bigramListPos; int readingPos = bigramListPos;
while (hasNext) { while (hasNext) {
const int entryPos = readingPos;
const BigramEntry bigramEntry = const BigramEntry bigramEntry =
mBigramDictContent->getBigramEntryAndAdvancePosition(&readingPos); mBigramDictContent->getBigramEntryAndAdvancePosition(&readingPos);
const int entryPos = readingPos - mBigramDictContent->getBigramEntrySize();
hasNext = bigramEntry.hasNext(); hasNext = bigramEntry.hasNext();
if (!bigramEntry.isValid()) { if (!bigramEntry.isValid()) {
continue; continue;

2
native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp
View file

@ -242,9 +242,9 @@ bool Ver4PatriciaTrieWritingHelper::truncateBigrams(const int maxBigramCount) {
bool hasNext = true; bool hasNext = true;
int readingPos = bigramListPos; int readingPos = bigramListPos;
while (hasNext) { while (hasNext) {
const int entryPos = readingPos;
const BigramEntry bigramEntry = const BigramEntry bigramEntry =
bigramDictContent->getBigramEntryAndAdvancePosition(&readingPos); bigramDictContent->getBigramEntryAndAdvancePosition(&readingPos);
const int entryPos = readingPos - bigramDictContent->getBigramEntrySize();
hasNext = bigramEntry.hasNext(); hasNext = bigramEntry.hasNext();
if (!bigramEntry.isValid()) { if (!bigramEntry.isValid()) {
continue; continue;