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

Commit fe657aa9 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am:... 

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 21d18e1a am: ee2425c0 am: 96dcbb27 am: a85f1bea am: 5dddb54b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13287217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e0c4d21e0eb5b908484c316f6047a21536b6d27
parents 5d26f0d8 5dddb54b

system/stack/avrc/avrc_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static uint8_t* avrc_get_data_ptr(BT_HDR* p_pkt) { 
static BT_HDR* avrc_copy_packet(BT_HDR* p_pkt, int rsp_pkt_len) {

  const int offset = MAX(AVCT_MSG_OFFSET, p_pkt->offset);

  const int pkt_len = MAX(rsp_pkt_len, p_pkt->len);

  BT_HDR* p_pkt_copy = (BT_HDR*)osi_malloc(BT_HDR_SIZE + offset + pkt_len);

  BT_HDR* p_pkt_copy = (BT_HDR*)osi_calloc(BT_HDR_SIZE + offset + pkt_len);



  /* Copy the packet header, set the new offset, and copy the payload */

  memcpy(p_pkt_copy, p_pkt, BT_HDR_SIZE);