Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f14894f authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

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

parents d5f32b38 198be3a6

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

+1 −1
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ bool Ver4BigramListPolicy::updateAllBigramEntriesAndDeleteUselessEntries(const i 
    bool hasNext = true;

    int readingPos = bigramListPos;

    while (hasNext) {

        const int entryPos = readingPos;

        const BigramEntry bigramEntry =

                mBigramDictContent->getBigramEntryAndAdvancePosition(&readingPos);

        const int entryPos = readingPos - mBigramDictContent->getBigramEntrySize();

        hasNext = bigramEntry.hasNext();

        if (!bigramEntry.isValid()) {

            continue;

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

+1 −1
Original line number Diff line number Diff line
@@ -242,9 +242,9 @@ bool Ver4PatriciaTrieWritingHelper::truncateBigrams(const int maxBigramCount) { 
        bool hasNext = true;

        int readingPos = bigramListPos;

        while (hasNext) {

            const int entryPos = readingPos;

            const BigramEntry bigramEntry =

                    bigramDictContent->getBigramEntryAndAdvancePosition(&readingPos);

            const int entryPos = readingPos - bigramDictContent->getBigramEntrySize();

            hasNext = bigramEntry.hasNext();

            if (!bigramEntry.isValid()) {

                continue;