From df4e0430de4ee16821217f8f4539ebf12ee27fbf Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 9 Feb 2010 10:58:26 -0800
Subject: [PATCH] Fix a crash in the dictionary due to releasing a null array.
---
.../com_android_inputmethod_latin_BinaryDictionary.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 3dda062fe5..d068f3faff 100644
--- a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -103,12 +103,14 @@ static int latinime_BinaryDictionary_getSuggestions(
int count = dictionary->getSuggestions(inputCodes, arraySize, (unsigned short*) outputChars, frequencies,
maxWordLength, maxWords, maxAlternatives, skipPos, nextLetters, nextLettersSize);
-
+
env->ReleaseIntArrayElements(frequencyArray, frequencies, 0);
env->ReleaseIntArrayElements(inputArray, inputCodes, JNI_ABORT);
env->ReleaseCharArrayElements(outputArray, outputChars, 0);
- env->ReleaseIntArrayElements(nextLettersArray, nextLetters, 0);
-
+ if (nextLetters) {
+ env->ReleaseIntArrayElements(nextLettersArray, nextLetters, 0);
+ }
+
return count;
}
--
GitLab