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

Commit ce199878 authored by Atanas Kirilov's avatar Atanas Kirilov Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into nyc-mr2-dev

parents 98ab2ebe beebc8ec

system/stack/sdp/sdp_discovery.c

+6 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static void process_service_search_rsp(tCONN_CB *p_ccb, UINT8 *p_reply, 
#if (SDP_RAW_DATA_INCLUDED == TRUE)

static void sdp_copy_raw_data (tCONN_CB *p_ccb, BOOLEAN offset)

{

    unsigned int    cpy_len;

    unsigned int    cpy_len, rem_len;

    UINT32          list_len;

    UINT8           *p;

    UINT8           type;
@@ -384,6 +384,11 @@ static void sdp_copy_raw_data (tCONN_CB *p_ccb, BOOLEAN offset) 
        {

            cpy_len = list_len;

        }

        rem_len = SDP_MAX_LIST_BYTE_COUNT - (unsigned int)(p - &p_ccb->rsp_list[0]);

        if (cpy_len > rem_len) {

            SDP_TRACE_WARNING("rem_len :%d less than cpy_len:%d", rem_len, cpy_len);

            cpy_len = rem_len;

        }

        SDP_TRACE_WARNING(

          "%s: list_len:%d cpy_len:%d p:%p p_ccb:%p p_db:%p raw_size:%d "

          "raw_used:%d raw_data:%p",