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

am 07718a5e: Merge "Fix: Reading invalid dictionary position." 

* commit '07718a5e7d31fee7aa9bcddda38ce04fabf6c5ac':
  Fix: Reading invalid dictionary position.
main
Keisuke Kuroynagi 2013-07-02 02:44:15 -07:00 committed by Android Git Automerger
parent 1b1f6ddc3e 07718a5e7d
commit 7d4b812275
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
native/jni/src/suggest/core/dictionary/terminal_attributes.h
View File

@ -76,12 +76,13 @@ class TerminalAttributes {
mNodeFlags(nodeFlags), mShortcutListSizePos(shortcutPos) {} mNodeFlags(nodeFlags), mShortcutListSizePos(shortcutPos) {}
inline ShortcutIterator getShortcutIterator() const { inline ShortcutIterator getShortcutIterator() const {
// The size of the shortcuts is stored here so that the whole shortcut chunk can be
// skipped quickly, so we ignore it.
int shortcutPos = mShortcutListSizePos; int shortcutPos = mShortcutListSizePos;
const bool hasShortcutList = 0 != (mNodeFlags & BinaryFormat::FLAG_HAS_SHORTCUT_TARGETS);
if (hasShortcutList) {
BinaryDictionaryTerminalAttributesReadingUtils::getShortcutListSizeAndForwardPointer( BinaryDictionaryTerminalAttributesReadingUtils::getShortcutListSizeAndForwardPointer(
mBinaryDictionaryInfo, &shortcutPos); mBinaryDictionaryInfo, &shortcutPos);
const bool hasShortcutList = 0 != (mNodeFlags & BinaryFormat::FLAG_HAS_SHORTCUT_TARGETS); }
// shortcutPos is never used if hasShortcutList is false.
return ShortcutIterator(mBinaryDictionaryInfo, shortcutPos, hasShortcutList); return ShortcutIterator(mBinaryDictionaryInfo, shortcutPos, hasShortcutList);
} }