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

Commit 043d5b99 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29693391']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29693391'] into security-aosp-udc-release.

Change-Id: Ie8cbd82a476d027f634378fb3d9b15cd4991b5ca
parents 7ae72086 c7468e64

system/stack/gatt/gatt_sr.cc

+21 −0
Original line number Diff line number Diff line
@@ -734,6 +734,11 @@ void gatts_process_primary_service_req(tGATT_TCB& tcb, uint16_t cid, 


  uint16_t payload_size = gatt_tcb_get_payload_size_tx(tcb, cid);



  // This can happen if the channel is already closed.

  if (payload_size == 0) {

    return;

  }



  uint16_t msg_len =

      (uint16_t)(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET);

  BT_HDR* p_msg = (BT_HDR*)osi_calloc(msg_len);
@@ -769,6 +774,12 @@ static void gatts_process_find_info(tGATT_TCB& tcb, uint16_t cid, 
  }



  uint16_t payload_size = gatt_tcb_get_payload_size_tx(tcb, cid);



  // This can happen if the channel is already closed.

  if (payload_size == 0) {

    return;

  }



  uint16_t buf_len =

      (uint16_t)(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET);
@@ -909,6 +920,11 @@ static void gatts_process_read_by_type_req(tGATT_TCB& tcb, uint16_t cid, 


  uint16_t payload_size = gatt_tcb_get_payload_size_tx(tcb, cid);



  // This can happen if the channel is already closed.

  if (payload_size == 0) {

    return;

  }



  size_t msg_len = sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET;

  BT_HDR* p_msg = (BT_HDR*)osi_calloc(msg_len);

  uint8_t* p = (uint8_t*)(p_msg + 1) + L2CAP_MIN_OFFSET;
@@ -1056,6 +1072,11 @@ static void gatts_process_read_req(tGATT_TCB& tcb, uint16_t cid, 
                                   uint8_t* p_data) {

  uint16_t payload_size = gatt_tcb_get_payload_size_tx(tcb, cid);



  // This can happen if the channel is already closed.

  if (payload_size == 0) {

    return;

  }



  size_t buf_len = sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET;

  uint16_t offset = 0;