From 402b0570505c7ea1389e1c153e5db0300568ce26 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Tue, 29 May 2012 15:56:30 +0900 Subject: [PATCH] Fix two small possible bugs. None of these had any real impact, but they were potential liabilities for the future Change-Id: I2de581f8b638e423d47a6d99b1a3c96af4c6150d --- native/jni/src/bigram_dictionary.cpp | 2 +- native/jni/src/binary_format.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index ac2a26172..8c73f4400 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -149,8 +149,8 @@ int BigramDictionary::getBigramListPositionForWord(const int32_t *prevWord, } else { pos = BinaryFormat::skipOtherCharacters(root, pos); } - pos = BinaryFormat::skipChildrenPosition(flags, pos); pos = BinaryFormat::skipFrequency(flags, pos); + pos = BinaryFormat::skipChildrenPosition(flags, pos); pos = BinaryFormat::skipShortcuts(root, flags, pos); return pos; } diff --git a/native/jni/src/binary_format.h b/native/jni/src/binary_format.h index 40f197619..4a1649c5e 100644 --- a/native/jni/src/binary_format.h +++ b/native/jni/src/binary_format.h @@ -421,7 +421,7 @@ inline int BinaryFormat::getWordAtAddress(const uint8_t* const root, const int a // We count chars in order to avoid infinite loops if the file is broken or // if there is some other bug int charCount = maxDepth; - while (-1 != nextChar && --charCount > 0) { + while (NOT_A_CHARACTER != nextChar && --charCount > 0) { outWord[++wordPos] = nextChar; nextChar = getCharCodeAndForwardPointer(root, &pos); }