commit 3a2799939b2da543ed3a62f29db658cb05f8ad3b
author akirilov <akirilov@google.com> Mon May 21 12:56:17 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 20 00:20:24 2018 +0000
tree 88b92e51e548cf220fa8ee58ff764bcc1ffe21cb
parent 2898425fff7bd9d9907b7e870d6b26771ea74735

RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

Bug: 74075873
Test: manual test (poc in bug)
Change-Id: I56e87cfdf8731acca00cefac98abb2ba06f6e7ed
(cherry picked from commit 3575ba8ca36dccf7dcdb2dbf16ed170d549911d3)

stack/sdp/sdp_discovery.cc

diff --git a/stack/sdp/sdp_discovery.cc b/stack/sdp/sdp_discovery.cc
index b259157..f5dab6e 100644
--- a/stack/sdp/sdp_discovery.cc
+++ b/stack/sdp/sdp_discovery.cc
@@ -357,7 +357,7 @@
       type = *p++;
       p = sdpu_get_len_from_type(p, type, &list_len);
     }
-    if (list_len && list_len < cpy_len) {
+    if (list_len < cpy_len) {
       cpy_len = list_len;
     }
     SDP_TRACE_WARNING(