Add boundary check for ver4 bigram/shortcut reading. (7b496a58) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,13 @@ namespace latinime {
		const BigramEntry BigramDictContent::getBigramEntryAndAdvancePosition(
		int *const bigramEntryPos) const {
		const BufferWithExtendableBuffer *const bigramListBuffer = getContentBuffer();
		if (bigramEntryPos < 0 \|\| bigramEntryPos >= bigramListBuffer->getTailPosition()) {
		AKLOGE("Invalid bigram entry position. bigramEntryPos: %d, bufSize: %d",
		*bigramEntryPos, bigramListBuffer->getTailPosition());
		ASSERT(false);
		return BigramEntry(false /* hasNext */, NOT_A_PROBABILITY,
		Ver4DictConstants::NOT_A_TERMINAL_ID);
		}
		const int bigramFlags = bigramListBuffer->readUintAndAdvancePosition(
		Ver4DictConstants::BIGRAM_FLAGS_FIELD_SIZE, bigramEntryPos);
		const bool hasNext = (bigramFlags & Ver4DictConstants::BIGRAM_HAS_NEXT_MASK) != 0;

+13 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,19 @@ void ShortcutDictContent::getShortcutEntryAndAdvancePosition(const int maxCodePo
		int const outCodePoint, int const outCodePointCount, int *const outProbability,
		bool const outhasNext, int const shortcutEntryPos) const {
		const BufferWithExtendableBuffer *const shortcutListBuffer = getContentBuffer();
		if (shortcutEntryPos < 0 \|\| shortcutEntryPos >= shortcutListBuffer->getTailPosition()) {
		AKLOGE("Invalid shortcut entry position. shortcutEntryPos: %d, bufSize: %d",
		*shortcutEntryPos, shortcutListBuffer->getTailPosition());
		ASSERT(false);
		if (outhasNext) {
		*outhasNext = false;
		}
		if (outCodePointCount) {
		*outCodePointCount = 0;
		}
		return;
		}

		const int shortcutFlags = shortcutListBuffer->readUintAndAdvancePosition(
		Ver4DictConstants::SHORTCUT_FLAGS_FIELD_SIZE, shortcutEntryPos);
		if (outProbability) {