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

Commit 63860c5d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-2c2c464f-fb3a-4c93-8661-57c986c3e069-nyc-dev" into cw-f-dev 

* changes:
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f am: 65f906e7 am: 8f6afaa7
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f am: 65f906e7
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f
  DO NOT MERGE SDP: Fix the param_len recalculation
parents 5381b8b1 e80eab6c

system/stack/sdp/sdp_server.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -360,7 +360,6 @@ static void process_service_attr_req (tCONN_CB *p_ccb, UINT16 trans_num, 
    if (max_list_len > (p_ccb->rem_mtu_size - SDP_MAX_ATTR_RSPHDR_LEN))

    if (max_list_len > (p_ccb->rem_mtu_size - SDP_MAX_ATTR_RSPHDR_LEN))

        max_list_len = p_ccb->rem_mtu_size - SDP_MAX_ATTR_RSPHDR_LEN;

        max_list_len = p_ccb->rem_mtu_size - SDP_MAX_ATTR_RSPHDR_LEN;





    param_len = (UINT16)(p_req_end - p_req);

    p_req = sdpu_extract_attr_seq (p_req, param_len, &attr_seq);

    p_req = sdpu_extract_attr_seq (p_req, param_len, &attr_seq);





    if ((!p_req) || (!attr_seq.num_attr) ||

    if ((!p_req) || (!attr_seq.num_attr) ||
@@ -608,6 +607,7 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num, 
    if (max_list_len > (p_ccb->rem_mtu_size - SDP_MAX_SERVATTR_RSPHDR_LEN))

    if (max_list_len > (p_ccb->rem_mtu_size - SDP_MAX_SERVATTR_RSPHDR_LEN))

        max_list_len = p_ccb->rem_mtu_size - SDP_MAX_SERVATTR_RSPHDR_LEN;

        max_list_len = p_ccb->rem_mtu_size - SDP_MAX_SERVATTR_RSPHDR_LEN;





    param_len = (UINT16)(p_req_end - p_req);

    p_req = sdpu_extract_attr_seq (p_req, param_len, &attr_seq);

    p_req = sdpu_extract_attr_seq (p_req, param_len, &attr_seq);





    if ((!p_req) || (!attr_seq.num_attr) ||

    if ((!p_req) || (!attr_seq.num_attr) ||