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

Commit 2adf465a authored by Atanas Kirilov's avatar Atanas Kirilov Committed by android-build-merger
Browse files

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

am: bb90e1eb

Change-Id: I7c0c0f1b6d8efae4f263d20f97041b2acffa78f6
parents 7f1e3619 bb90e1eb

system/stack/sdp/sdp_discovery.cc

+6 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static void process_service_search_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
 ******************************************************************************/

#if (SDP_RAW_DATA_INCLUDED == TRUE)

static void sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) {

  unsigned int cpy_len;

  unsigned int cpy_len, rem_len;

  uint32_t list_len;

  uint8_t* p;

  uint8_t type;
@@ -358,6 +358,11 @@ static void sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) { 
    if (list_len < cpy_len) {

      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",