From 04be7ae5771ee1edc6cbe2af26998755d7be5a68 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 29 May 2018 16:55:58 -0700 Subject: [PATCH] DO NOT MERGE: SDP: Recalculate param_len after max_list_len Bug: 78136869 Test: manual connection to an A2DP device Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1 (cherry picked from commit 9cc9eea21c7868034242b7ab8be750c565e46bfd) --- stack/sdp/sdp_server.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/stack/sdp/sdp_server.cc b/stack/sdp/sdp_server.cc index 121c248ad..d2bbd6c4d 100644 --- a/stack/sdp/sdp_server.cc +++ b/stack/sdp/sdp_server.cc @@ -569,6 +569,7 @@ static void process_service_search_attr_req(tCONN_CB* p_ccb, uint16_t trans_num, 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; + param_len = static_cast(p_req_end - p_req); p_req = sdpu_extract_attr_seq(p_req, param_len, &attr_seq); if ((!p_req) || (!attr_seq.num_attr) || -- 2.11.0