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

Commit 1a25f81b authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Make sure server response doesn't exceed maximum allowable length" into... 

Merge "Make sure server response doesn't exceed maximum allowable length" into pi-dev am: 5f46e657
am: a0820c78

Change-Id: If90a7f59db1d3489ba9135b2b437be2590b369f4
parents 26729954 a0820c78

android/app/jni/com_android_bluetooth_gatt.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,13 @@ static void gattServerSendResponseNative(JNIEnv* env, jobject object, 
  response.attr_value.len = 0;



  if (val != NULL) {

    if (env->GetArrayLength(val) < BTGATT_MAX_ATTR_LEN) {

      response.attr_value.len = (uint16_t)env->GetArrayLength(val);

    } else {

      android_errorWriteLog(0x534e4554, "78787521");

      response.attr_value.len = BTGATT_MAX_ATTR_LEN;

    }



    jbyte* array = env->GetByteArrayElements(val, 0);



    for (int i = 0; i != response.attr_value.len; ++i)