diff options
| author | 2017-01-06 00:29:29 +0000 | |
|---|---|---|
| committer | 2017-01-06 00:29:29 +0000 | |
| commit | 97e98f18b754da5f437045a97302e320d79ef646 (patch) | |
| tree | a0318d66cd37a0ef7c97f57f60a677fcf3e6c128 | |
| parent | d7f371813a6fd7e2840fc25b3b3ac80b8280ec21 (diff) | |
| parent | bd38f6f4f8abea71711e7ef129e6706e56b3bfdc (diff) | |
Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am: 1d8995aa9c
am: bd38f6f4f8
Change-Id: Id28b9734e27b62f2eb642a4193482e9026f8f3b7
| -rw-r--r-- | core/jni/android_hardware_location_ContextHubService.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/android_hardware_location_ContextHubService.cpp b/core/jni/android_hardware_location_ContextHubService.cpp index 8eb39e1aac58..fbccfd5532e2 100644 --- a/core/jni/android_hardware_location_ContextHubService.cpp +++ b/core/jni/android_hardware_location_ContextHubService.cpp @@ -33,6 +33,7 @@ #include <unordered_map> #include <queue> +#include <android-base/macros.h> #include <cutils/log.h> #include "JNIHelp.h" @@ -704,10 +705,10 @@ static void passOnOsResponse(uint32_t hubHandle, uint32_t msgType, } jbyteArray jmsg = env->NewByteArray(msgLen); - jintArray jheader = env->NewIntArray(sizeof(header)); + jintArray jheader = env->NewIntArray(arraysize(header)); env->SetByteArrayRegion(jmsg, 0, msgLen, (jbyte *)msg); - env->SetIntArrayRegion(jheader, 0, sizeof(header), (jint *)header); + env->SetIntArrayRegion(jheader, 0, arraysize(header), (jint *)header); ALOGI("Passing msg type %" PRIu32 " from app %" PRIu32 " from hub %" PRIu32, header[HEADER_FIELD_MSG_TYPE], header[HEADER_FIELD_APP_INSTANCE], |