commit 87db038c6dd364266372b608ebe75293bbbb17d9
author android-build-team Robot <android-build-team-robot@google.com> Mon Feb 08 23:51:14 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Feb 08 23:51:14 2021 +0000
tree 1cd80389845908b5067becad5903b1553cd29507
parent fae5cc7475dff7fcff461945de2c25ea1ac18c2b
parent 2eedc09686db775d88cf074e6e459c6d232c262b

Snap for 7132927 from 2eedc09686db775d88cf074e6e459c6d232c262b to mainline-conscrypt-release

Change-Id: Ice3dccced8476710e1e28cfab603659195714b47

stack/avrc/avrc_api.cc

diff --git a/stack/avrc/avrc_api.cc b/stack/avrc/avrc_api.cc
index 62b7fe4..4565b50 100644
--- a/stack/avrc/avrc_api.cc
+++ b/stack/avrc/avrc_api.cc
@@ -237,7 +237,7 @@
 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);