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

Commit 3987efa9 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev

parents cd68000c 460d53a0

jni/com_android_bluetooth_gatt.cpp

+5 −0
Original line number Diff line number Diff line
@@ -991,6 +991,11 @@ static void gattClientWriteDescriptorNative(JNIEnv* env, jobject object, 
{

    if (!sGattIf) return;



    if (value == NULL) {

        warn("gattClientWriteDescriptorNative() ignoring NULL array");

        return;

    }



    btgatt_srvc_id_t srvc_id;

    srvc_id.id.inst_id = (uint8_t) service_id_inst_id;

    srvc_id.is_primary = (service_type == BTGATT_SERVICE_TYPE_PRIMARY ? 1 : 0);