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

Merge "Add missing error check in TrieMap."

main
Keisuke Kuroyanagi 2014-12-15 10:34:35 +00:00 committed by Android (Google) Code Review
parent ba8a03d7b9 5e1b225082
commit 8ab508117d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp
View File

@ -79,6 +79,9 @@ int TrieMap::getNextLevelBitmapEntryIndex(const int key, const int bitmapEntryIn
} }
// Create a value entry and a bitmap entry. // Create a value entry and a bitmap entry.
const int valueEntryIndex = allocateTable(TERMINAL_LINKED_ENTRY_COUNT); const int valueEntryIndex = allocateTable(TERMINAL_LINKED_ENTRY_COUNT);
if (valueEntryIndex == INVALID_INDEX) {
return INVALID_INDEX;
}
if (!writeEntry(Entry(0, terminalEntry.getValue()), valueEntryIndex)) { if (!writeEntry(Entry(0, terminalEntry.getValue()), valueEntryIndex)) {
return INVALID_INDEX; return INVALID_INDEX;
} }
@ -195,6 +198,9 @@ bool TrieMap::writeValue(const uint64_t value, const int terminalEntryIndex) {
} }
// Create value entry and write value. // Create value entry and write value.
const int valueEntryIndex = allocateTable(TERMINAL_LINKED_ENTRY_COUNT); const int valueEntryIndex = allocateTable(TERMINAL_LINKED_ENTRY_COUNT);
if (valueEntryIndex == INVALID_INDEX) {
return false;
}
if (!writeEntry(Entry(value >> (FIELD1_SIZE * CHAR_BIT), value), valueEntryIndex)) { if (!writeEntry(Entry(value >> (FIELD1_SIZE * CHAR_BIT), value), valueEntryIndex)) {
return false; return false;
} }