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

Commit 80e818f5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19747508] into tm-release. 

Change-Id: Ic8ad7530d77c4a85d54bf7c06227bbe9db89f9a1
parents 81c7d1d8 9d8fd778

system/stack/avdt/avdt_msg.cc

+0 −4
Original line number Diff line number Diff line
@@ -1252,10 +1252,6 @@ BT_HDR* avdt_msg_asmbl(AvdtpCcb* p_ccb, BT_HDR* p_buf) { 
     * would have allocated smaller buffer.

     */

    p_ccb->p_rx_msg = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);

    if (sizeof(BT_HDR) + p_buf->offset + p_buf->len > BT_DEFAULT_BUFFER_SIZE) {

      android_errorWriteLog(0x534e4554, "232023771");

      return NULL;

    }

    memcpy(p_ccb->p_rx_msg, p_buf, sizeof(BT_HDR) + p_buf->offset + p_buf->len);



    /* Free original buffer */