提交: 52cd67a7deb9ba11f2bab1897992ff91077a79bf - system-bt (git)

system/bt

Commit MetaInfo

• 修订版: 52cd67a7deb9ba11f2bab1897992ff91077a79bf (tree)
• 时间: 2019-12-04 08:29:41
• 作者: Automerger Merge Worker <android-build-automerger-merge-worker@syst...>
• Commiter: Automerger Merge Worker

Log Message

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6 am: 1f3bc32195

Change-Id: I08a3792c2110c102e1a61051ff74bfa8ef8735c8

更改概述

• modified: stack/sdp/sdp_discovery.cc

差异

--- a/stack/sdp/sdp_discovery.cc
+++ b/stack/sdp/sdp_discovery.cc
@@ -471,6 +471,7 @@ static void process_service_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply,
       if (!sdp_copy_raw_data(p_ccb, false)) {
         SDP_TRACE_ERROR("sdp_copy_raw_data failed");
         sdp_disconnect(p_ccb, SDP_ILLEGAL_PARAMETER);
+        return;
       }
 
 #endif
@@ -700,6 +701,7 @@ static void process_service_search_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply,
   if (!sdp_copy_raw_data(p_ccb, true)) {
     SDP_TRACE_ERROR("sdp_copy_raw_data failed");
     sdp_disconnect(p_ccb, SDP_ILLEGAL_PARAMETER);
+    return;
   }
 #endif