aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-08-10 06:21:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-10 06:21:31 -0700
commitec1e373a20e961d18dfd68db6b58c97c4da4176b (patch)
tree1fc6be6d6b10d2c7b86beafebfe971ff53819493 /native/jni/src
parentcaa197d76f8eb27dbb4fa400bace4db625b930bd (diff)
parent063c3e2171e546957d8c40575740c29f234e307c (diff)
downloadlatinime-ec1e373a20e961d18dfd68db6b58c97c4da4176b.tar.gz
latinime-ec1e373a20e961d18dfd68db6b58c97c4da4176b.tar.xz
latinime-ec1e373a20e961d18dfd68db6b58c97c4da4176b.zip
am 063c3e21: Fix memset() bugs
* commit '063c3e2171e546957d8c40575740c29f234e307c': Fix memset() bugs
Diffstat (limited to 'native/jni/src')
-rw-r--r--native/jni/src/proximity_info.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 2633913f7..18a0b74a8 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -34,7 +34,7 @@ static inline void safeGetOrFillZeroIntArrayRegion(JNIEnv *env, jintArray jArray
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 @@ static inline void safeGetOrFillZeroFloatArrayRegion(JNIEnv *env, jfloatArray jA
if (jArray && buffer) {
env->GetFloatArrayRegion(jArray, 0, len, buffer);
} else if (buffer) {
- memset(buffer, 0, len);
+ memset(buffer, 0, len * sizeof(jfloat));
}
}