diff options
author | 2014-12-15 10:39:50 +0000 | |
---|---|---|
committer | 2014-12-15 10:39:50 +0000 | |
commit | 0ca71d4aca4c189a6e6cca22f42b36bc3490bb35 (patch) | |
tree | 97f79efc97240786bb354d53d884b4dde4667652 | |
parent | baf8e9221b903f93a988ccca93936ca690f090d7 (diff) | |
parent | 8ab508117da569754b6df3646a5932246fc927f7 (diff) | |
download | latinime-0ca71d4aca4c189a6e6cca22f42b36bc3490bb35.tar.gz latinime-0ca71d4aca4c189a6e6cca22f42b36bc3490bb35.tar.xz latinime-0ca71d4aca4c189a6e6cca22f42b36bc3490bb35.zip |
am 8ab50811: Merge "Add missing error check in TrieMap."
* commit '8ab508117da569754b6df3646a5932246fc927f7':
Add missing error check in TrieMap.
-rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp index 39f417ebb..b7ef2b9bd 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp @@ -79,6 +79,9 @@ int TrieMap::getNextLevelBitmapEntryIndex(const int key, const int bitmapEntryIn } // Create a value entry and a bitmap entry. const int valueEntryIndex = allocateTable(TERMINAL_LINKED_ENTRY_COUNT); + if (valueEntryIndex == INVALID_INDEX) { + return INVALID_INDEX; + } if (!writeEntry(Entry(0, terminalEntry.getValue()), valueEntryIndex)) { return INVALID_INDEX; } @@ -195,6 +198,9 @@ bool TrieMap::writeValue(const uint64_t value, const int terminalEntryIndex) { } // Create value entry and write value. const int valueEntryIndex = allocateTable(TERMINAL_LINKED_ENTRY_COUNT); + if (valueEntryIndex == INVALID_INDEX) { + return false; + } if (!writeEntry(Entry(value >> (FIELD1_SIZE * CHAR_BIT), value), valueEntryIndex)) { return false; } |