commit 04be7ae5771ee1edc6cbe2af26998755d7be5a68
author Myles Watson <mylesgw@google.com> Tue May 29 16:55:58 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Aug 10 20:30:44 2018 +0000
tree ff6fb423dc7373d4da41e3235a89b14ae75c72a2
parent 6a999cabb30958e180048d70df46b39fcbf60dda

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

diff --git a/stack/sdp/sdp_server.cc b/stack/sdp/sdp_server.cc
index 121c248a..d2bbd6c 100644
--- a/stack/sdp/sdp_server.cc
+++ b/stack/sdp/sdp_server.cc
@@ -569,6 +569,7 @@
   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<uint16_t>(p_req_end - p_req);
   p_req = sdpu_extract_attr_seq(p_req, param_len, &attr_seq);
 
   if ((!p_req) || (!attr_seq.num_attr) ||