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

am 4db09448: Merge "Boundary check for ProximityInfoState::getProximityTypeG()." 

* commit '4db09448e98b81fe285d685c11988beed55b0208':
  Boundary check for ProximityInfoState::getProximityTypeG().
main
Keisuke Kuroyanagi 2014-01-10 03:26:21 -08:00 committed by Android Git Automerger
parent 1255712a17 4db09448e9
commit 7110ce3339
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/src/suggest/core/layout/proximity_info_state.cpp
View File

@ -255,6 +255,14 @@ ProximityType ProximityInfoState::getProximityTypeG(const int index, const int c
if (!isUsed()) { if (!isUsed()) {
return UNRELATED_CHAR; return UNRELATED_CHAR;
} }
const int sampledSearchKeyVectorsSize = static_cast<int>(mSampledSearchKeyVectors.size());
if (index < 0 || index >= sampledSearchKeyVectorsSize) {
AKLOGE("getProximityTypeG() is called with an invalid index(%d). "
"mSampledSearchKeyVectors.size() = %d, codePoint = %x.", index,
sampledSearchKeyVectorsSize, codePoint);
ASSERT(false);
return UNRELATED_CHAR;
}
const int lowerCodePoint = CharUtils::toLowerCase(codePoint); const int lowerCodePoint = CharUtils::toLowerCase(codePoint);
const int baseLowerCodePoint = CharUtils::toBaseCodePoint(lowerCodePoint); const int baseLowerCodePoint = CharUtils::toBaseCodePoint(lowerCodePoint);
for (int i = 0; i < static_cast<int>(mSampledSearchKeyVectors[index].size()); ++i) { for (int i = 0; i < static_cast<int>(mSampledSearchKeyVectors[index].size()); ++i) {