Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac87a46d authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

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

am: 97e98f18

Change-Id: I9bf7d8e447796196d44055a29936de3d68f9ece9
parents ea7931d1 97e98f18

core/jni/android_hardware_location_ContextHubService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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],