commit 53feb9b8158187a853db570d94e348c1a83df26f
author Zongheng Wang <wangzongheng@google.com> Tue Nov 12 12:59:44 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 18 06:24:22 2019 +0000
tree d1f35620159dbef8063dc8b37b10e3bd479cdc04
parent 0d1854fa972f46f52cb6a2c5da9672a842d51243

SDP: add return after SDP disconnection

A return is needed after sdp_disconnect(). It is the logic
expected and it prevents the use of p_ccb after it's freed.

Bug: 144177780
Bug: 117105007
Test: manual test
Change-Id: I7a64382b36adca37a8ff0c7e361d89ecdc8f3b55
(cherry picked from commit 79cd4eb638fcabb6c4422cc5f68aa1a1ec4b8e37)
(cherry picked from commit d76a2d2b964ea2132e89ded7d85b2756653d6959)

system/stack/sdp/sdp_discovery.cc

diff --git a/system/stack/sdp/sdp_discovery.cc b/system/stack/sdp/sdp_discovery.cc
index baadd7a..bdc15bd 100644
--- a/system/stack/sdp/sdp_discovery.cc
+++ b/system/stack/sdp/sdp_discovery.cc
@@ -436,6 +436,7 @@
       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 @@
   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