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

Commit 6b0a1511 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "BLE: Don't access freed buffer in log message" into oc-dev 

am: 77698719

Change-Id: I024b9dea0a7a6137410910f35e296b8cbec0a17e
parents 4569a958 77698719

system/stack/gatt/att_protocol.cc

+1 −2
Original line number Original line Diff line number Diff line
@@ -330,8 +330,7 @@ tGATT_STATUS attp_send_msg_to_l2cap(tGATT_TCB& tcb, BT_HDR* p_toL2CAP) { 
    l2cap_ret = (uint16_t)L2CA_DataWrite(tcb.att_lcid, p_toL2CAP);

    l2cap_ret = (uint16_t)L2CA_DataWrite(tcb.att_lcid, p_toL2CAP);





  if (l2cap_ret == L2CAP_DW_FAILED) {

  if (l2cap_ret == L2CAP_DW_FAILED) {

    GATT_TRACE_ERROR("ATT   failed to pass msg:0x%0x to L2CAP",

    GATT_TRACE_ERROR("ATT failed to pass msg to L2CAP");

                     *((uint8_t*)(p_toL2CAP + 1) + p_toL2CAP->offset));

    return GATT_INTERNAL_ERROR;

    return GATT_INTERNAL_ERROR;

  } else if (l2cap_ret == L2CAP_DW_CONGESTED) {

  } else if (l2cap_ret == L2CAP_DW_CONGESTED) {

    GATT_TRACE_DEBUG("ATT congested, message accepted");

    GATT_TRACE_DEBUG("ATT congested, message accepted");