Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am: 1d8995aa9c

Browse Source 
am: bd38f6f4f8

Change-Id: Id28b9734e27b62f2eb642a4193482e9026f8f3b7
This commit is contained in:
Evgenii Stepanov
2017-01-06 00:29:29 +00:00
committed by android-build-merger
parent d7f371813a bd38f6f4f8
commit 97e98f18b7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_hardware_location_ContextHubService.cpp
View File

@@ -33,6 +33,7 @@
#include <unordered_map> #include <unordered_map>
#include <queue> #include <queue>
#include <android-base/macros.h>
#include <cutils/log.h> #include <cutils/log.h>
#include "JNIHelp.h" #include "JNIHelp.h"
@@ -704,10 +705,10 @@ static void passOnOsResponse(uint32_t hubHandle, uint32_t msgType,
} }
jbyteArray jmsg = env->NewByteArray(msgLen); 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->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, ALOGI("Passing msg type %" PRIu32 " from app %" PRIu32 " from hub %" PRIu32,
header[HEADER_FIELD_MSG_TYPE], header[HEADER_FIELD_APP_INSTANCE], header[HEADER_FIELD_MSG_TYPE], header[HEADER_FIELD_APP_INSTANCE],