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

Commit c4328ca9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:... 

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: cd26d8d6 am: 2e1be2f7 am: 5ba11e61

Change-Id: I164001793fe32ef903c430594d93dc800e8c396f
parents f34d9498 5ba11e61

system/stack/sdp/sdp_discovery.c

+6 −1
Original line number Diff line number Diff line
@@ -358,7 +358,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;
@@ -389,6 +389,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;

        }

#if (SDP_DEBUG_RAW == TRUE)

        SDP_TRACE_WARNING("list_len :%d cpy_len:%d raw_size:%d raw_used:%d",

            list_len, cpy_len, p_ccb->p_db->raw_size, p_ccb->p_db->raw_used);