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

Commit c7ba5d29 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Fix bug in SDP 128-bit UUID lookup 

Also re-factored the surrounding code slightly to where it would have
prevented this type of bug in the first place...

Change-Id: I7b7ed4459c4f377d97b608bfe2e0c13aac31680e
parent ec2bcf10

system/stack/sdp/sdp_api.c

+6 −6
Original line number Diff line number Diff line
@@ -428,16 +428,14 @@ BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) 
BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid)

{

#if SDP_CLIENT_ENABLED == TRUE

    tSDP_DISC_ATTR  *p_attr, *p_sattr;



    p_attr = p_rec->p_first_attr;



    tSDP_DISC_ATTR  *p_attr = p_rec->p_first_attr;

    while (p_attr)

    {

        if ((p_attr->attr_id == ATTR_ID_SERVICE_CLASS_ID_LIST)

            && (SDP_DISC_ATTR_TYPE(p_attr->attr_len_type) == DATA_ELE_SEQ_DESC_TYPE))

        {

            for (p_sattr = p_attr->attr_value.v.p_sub_attr; p_sattr; p_sattr = p_sattr->p_next_attr)

            tSDP_DISC_ATTR *p_sattr = p_attr->attr_value.v.p_sub_attr;

            while (p_sattr)

            {

                if (SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == UUID_DESC_TYPE)

                {
@@ -450,6 +448,8 @@ BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) 
                    }

                    return(TRUE);

                }



                p_sattr = p_sattr->p_next_attr;

            }

            break;

        }
@@ -461,7 +461,7 @@ BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) 
            {

                p_uuid->len = LEN_UUID_128;

                for (uint8_t i = 0; i != LEN_UUID_128; ++i)

                    p_uuid->uu.uuid128[i] = p_sattr->attr_value.v.array[LEN_UUID_128-i-1];

                    p_uuid->uu.uuid128[i] = p_attr->attr_value.v.array[LEN_UUID_128-i-1];

                return(TRUE);

            }

        }