commit de2f8424ea7e201ab8ee0d3c64fac0b52514d24e
author Yusuke Nojima <nojima@google.com> Tue Sep 27 11:15:18 2011 +0900
committer Yusuke Nojima <nojima@google.com> Tue Sep 27 14:51:41 2011 +0900
tree 789901ec616e2d7107b797a400ac6ca3a133ac25
parent c9f562a9a4c2b634eb43d1ddaef69068c0d93f6f

Add explicit NULL check to latinime_Keyboard_setProximityInfo() and ProximityInfo::ProximityInfo().

Bug: 5375319
Change-Id: If3016ab56b6c62c8855b394f23e09e127a279be7

native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
index d4fa436..7647a08 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
@@ -33,21 +33,21 @@
         jint gridHeight, jintArray proximityCharsArray, jint keyCount,
         jintArray keyXCoordinateArray, jintArray keyYCoordinateArray, jintArray keyWidthArray,
         jintArray keyHeightArray, jintArray keyCharCodeArray) {
-    jint* proximityChars = env->GetIntArrayElements(proximityCharsArray, NULL);
-    jint* keyXCoordinates = env->GetIntArrayElements(keyXCoordinateArray, NULL);
-    jint* keyYCoordinates = env->GetIntArrayElements(keyYCoordinateArray, NULL);
-    jint* keyWidths = env->GetIntArrayElements(keyWidthArray, NULL);
-    jint* keyHeights = env->GetIntArrayElements(keyHeightArray, NULL);
-    jint* keyCharCodes = env->GetIntArrayElements(keyCharCodeArray, NULL);
+    jint *proximityChars = env->GetIntArrayElements(proximityCharsArray, NULL);
+    jint *keyXCoordinates = safeGetIntArrayElements(env, keyXCoordinateArray);
+    jint *keyYCoordinates = safeGetIntArrayElements(env, keyYCoordinateArray);
+    jint *keyWidths = safeGetIntArrayElements(env, keyWidthArray);
+    jint *keyHeights = safeGetIntArrayElements(env, keyHeightArray);
+    jint *keyCharCodes = safeGetIntArrayElements(env, keyCharCodeArray);
     ProximityInfo *proximityInfo = new ProximityInfo(maxProximityCharsSize, displayWidth,
-            displayHeight, gridWidth, gridHeight, (const uint32_t *)proximityChars,
-            keyCount, (const int32_t *)keyXCoordinates, (const int32_t *)keyYCoordinates,
-            (const int32_t *)keyWidths, (const int32_t *)keyHeights, (const int32_t *)keyCharCodes);
-    env->ReleaseIntArrayElements(keyCharCodeArray, keyCharCodes, 0);
-    env->ReleaseIntArrayElements(keyHeightArray, keyHeights, 0);
-    env->ReleaseIntArrayElements(keyWidthArray, keyWidths, 0);
-    env->ReleaseIntArrayElements(keyYCoordinateArray, keyYCoordinates, 0);
-    env->ReleaseIntArrayElements(keyXCoordinateArray, keyXCoordinates, 0);
+            displayHeight, gridWidth, gridHeight, (const uint32_t*)proximityChars,
+            keyCount, (const int32_t*)keyXCoordinates, (const int32_t*)keyYCoordinates,
+            (const int32_t*)keyWidths, (const int32_t*)keyHeights, (const int32_t*)keyCharCodes);
+    safeReleaseIntArrayElements(env, keyCharCodeArray, keyCharCodes);
+    safeReleaseIntArrayElements(env, keyHeightArray, keyHeights);
+    safeReleaseIntArrayElements(env, keyWidthArray, keyWidths);
+    safeReleaseIntArrayElements(env, keyYCoordinateArray, keyYCoordinates);
+    safeReleaseIntArrayElements(env, keyXCoordinateArray, keyXCoordinates);
     env->ReleaseIntArrayElements(proximityCharsArray, proximityChars, 0);
     return (jint)proximityInfo;
 }
@@ -64,7 +64,7 @@
 };
 
 int register_ProximityInfo(JNIEnv *env) {
-    const char* const kClassPathName = "com/android/inputmethod/keyboard/ProximityInfo";
+    const char *const kClassPathName = "com/android/inputmethod/keyboard/ProximityInfo";
     return registerNativeMethods(env, kClassPathName, sKeyboardMethods,
             sizeof(sKeyboardMethods) / sizeof(sKeyboardMethods[0]));
 }

native/jni/jni_common.h

diff --git a/native/jni/jni_common.h b/native/jni/jni_common.h
index c502fa3..dbf6d3e 100644
--- a/native/jni/jni_common.h
+++ b/native/jni/jni_common.h
@@ -18,13 +18,29 @@
 #ifndef LATINIME_JNI_COMMON_H
 #define LATINIME_JNI_COMMON_H
 
+#include <stdlib.h>
+
 #include "jni.h"
 
 namespace latinime {
 
-int registerNativeMethods(JNIEnv* env, const char* className, JNINativeMethod* methods,
+int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods,
         int numMethods);
 
+inline jint *safeGetIntArrayElements(JNIEnv *env, jintArray jArray) {
+    if (jArray) {
+        return env->GetIntArrayElements(jArray, NULL);
+    } else {
+        return NULL;
+    }
+}
+
+inline void safeReleaseIntArrayElements(JNIEnv *env, jintArray jArray, jint *cArray) {
+    if (jArray) {
+        env->ReleaseIntArrayElements(jArray, cArray, 0);
+    }
+}
+
 } // namespace latinime
 
 #endif // LATINIME_JNI_COMMON_H