commit 2eedc09686db775d88cf074e6e459c6d232c262b
author Myles Watson <mylesgw@google.com> Wed Feb 03 21:44:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 03 21:44:26 2021 +0000
tree 1cd80389845908b5067becad5903b1553cd29507
parent 8ab571ae03a1fa4b2a890ca365093104ae731f33
parent 3e928d15e1090f3029b98f5c156a470b58250cae

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee am: 131b92ac3f am: 6e271b0519 am: 8b3ad63b70 am: 3e928d15e1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5a4eaf88139a8f42fc2a78103d58200490a0e8

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);