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

am 9695342f: Merge "Add boundary check for SparseTable." 

* commit '9695342ff663954570c8172ac2e427c96ed2958f':
  Add boundary check for SparseTable.
main
Keisuke Kuroyanagi 2014-03-24 05:29:00 -07:00 committed by Android Git Automerger
parent 8e73ea1aa5 9695342ff6
commit 2923329b05
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/sparse_table.cpp
View File

@ -34,6 +34,12 @@ uint32_t SparseTable::get(const int id) const {
const int indexTableReadingPos = getPosInIndexTable(id); const int indexTableReadingPos = getPosInIndexTable(id);
const int index = mIndexTableBuffer->readUint(INDEX_SIZE, indexTableReadingPos); const int index = mIndexTableBuffer->readUint(INDEX_SIZE, indexTableReadingPos);
const int contentTableReadingPos = getPosInContentTable(id, index); const int contentTableReadingPos = getPosInContentTable(id, index);
if (contentTableReadingPos < 0
|| contentTableReadingPos >= mContentTableBuffer->getTailPosition()) {
AKLOGE("contentTableReadingPos(%d) is invalid. id: %d, index: %d",
contentTableReadingPos, id, index);
return NOT_A_DICT_POS;
}
const int contentValue = mContentTableBuffer->readUint(mDataSize, contentTableReadingPos); const int contentValue = mContentTableBuffer->readUint(mDataSize, contentTableReadingPos);
return contentValue == NOT_EXIST ? NOT_A_DICT_POS : contentValue; return contentValue == NOT_EXIST ? NOT_A_DICT_POS : contentValue;
} }