diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-11-01 01:55:02 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-11-01 01:55:03 -0700 |
| commit | d42af9da100a410b0d47dab40fa3e2099bfcc958 (patch) | |
| tree | 0f96b465664e48cfe2599a38a64dfad58c8c653e /native/jni/src/proximity_info.cpp | |
| parent | 93b5c2ce63705e7ebffd9bdb7358100e8d5b5235 (diff) | |
| parent | 44d9c1ebfc2a847233190f6201ae97b22df30ae7 (diff) | |
| download | latinime-d42af9da100a410b0d47dab40fa3e2099bfcc958.tar.gz latinime-d42af9da100a410b0d47dab40fa3e2099bfcc958.tar.xz latinime-d42af9da100a410b0d47dab40fa3e2099bfcc958.zip | |
Merge "Use sizeof() more safely."
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index e2aa15674..aadaae47e 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -36,7 +36,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 * sizeof(jint)); + memset(buffer, 0, len * sizeof(buffer[0])); } } @@ -45,7 +45,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 * sizeof(jfloat)); + memset(buffer, 0, len * sizeof(buffer[0])); } } |