commit 063c3e2171e546957d8c40575740c29f234e307c
author Ken Wakasa <kwakasa@google.com> Fri Aug 10 22:10:04 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Fri Aug 10 22:13:21 2012 +0900
tree 1fc6be6d6b10d2c7b86beafebfe971ff53819493
parent f3850e554389dc3012584f9d81a4f2d3d4c89e44

Fix memset() bugs

Change-Id: Icf4341c0a62e782cf8c2a863408591df4e6f07cb

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 876b439..7e1e0e4 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -170,10 +170,10 @@
     int spaceIndices[spaceIndicesLength];
     const jsize outputTypesLength = env->GetArrayLength(outputTypesArray);
     int outputTypes[outputTypesLength];
-    memset(outputChars, 0, outputCharsLength);
-    memset(scores, 0, scoresLength);
-    memset(spaceIndices, 0, spaceIndicesLength);
-    memset(outputTypes, 0, outputTypesLength);
+    memset(outputChars, 0, outputCharsLength * sizeof(outputChars[0]));
+    memset(scores, 0, scoresLength * sizeof(scores[0]));
+    memset(spaceIndices, 0, spaceIndicesLength * sizeof(spaceIndices[0]));
+    memset(outputTypes, 0, outputTypesLength * sizeof(outputTypes[0]));
 
     int count;
     if (isGesture || arraySize > 1) {

native/jni/src/proximity_info.cpp

diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 2633913..18a0b74 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -34,7 +34,7 @@
     if (jArray && buffer) {
         env->GetIntArrayRegion(jArray, 0, len, buffer);
     } else if (buffer) {
-        memset(buffer, 0, len);
+        memset(buffer, 0, len * sizeof(jint));
     }
 }
 
@@ -43,7 +43,7 @@
     if (jArray && buffer) {
         env->GetFloatArrayRegion(jArray, 0, len, buffer);
     } else if (buffer) {
-        memset(buffer, 0, len);
+        memset(buffer, 0, len * sizeof(jfloat));
     }
 }