Commit: ed89932fdcd63426e1bac8c5071b3fc6a4747db2 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: ed89932fdcd63426e1bac8c5071b3fc6a4747db2 (tree)
• Time: 2019-12-04 09:17:03
• Author: 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 am: 52cd67a7de am: 6ef3486983 am: 7b3e597303

Change-Id: If737087dc356efde7f2f7c3cc844cbbe7e948e2f

Change Summary

• modified: stack/sdp/sdp_discovery.cc

Incremental Difference

--- a/stack/sdp/sdp_discovery.cc
+++ b/stack/sdp/sdp_discovery.cc
@@ -436,6 +436,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
@@ -642,6 +643,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