aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-07-20 17:17:17 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-07-20 17:17:17 +0000
commit58417f923359c4f1ed8e27c4c51ba8637702acb5 (patch)
tree800758f8c85260e88a88545141135a8f6cf7f4d9
parentb1f262ed4028b8ffa7dbb7ee930dad7db201ded8 (diff)
parent7d92fdbb23e0a8820274ee703af18453e1ce457b (diff)
downloadbt-58417f923359c4f1ed8e27c4c51ba8637702acb5.tar.gz
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 7b2d711d9e am: 43d4bf00eb am: 7d92fdbb23
Change-Id: Ie9d7f0209ad248035cb65c9e6d04236ba61a9264
-rw-r--r--stack/sdp/sdp_server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stack/sdp/sdp_server.c b/stack/sdp/sdp_server.c
index 069227c2c..76a622e8e 100644
--- a/stack/sdp/sdp_server.c
+++ b/stack/sdp/sdp_server.c
@@ -363,7 +363,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))
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);
if ((!p_req) || (!attr_seq.num_attr) ||
@@ -647,6 +646,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))
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);
if ((!p_req) || (!attr_seq.num_attr) ||