Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e228a99 authored by Zach Johnson's avatar Zach Johnson Committed by android-build-merger
Browse files

Merge "btm_sec: p_name fails matching security records" 

am: f1607be1

Change-Id: Ia2c574d1a36f840045110d55a6d34fb89776890e
parents 72ffb4d2 f1607be1

system/stack/btm/btm_sec.cc

+4 −2
Original line number Diff line number Diff line
@@ -532,9 +532,11 @@ static bool btm_sec_set_security_level(CONNECTION_TYPE conn_type, 
      if (p_srec->psm == psm && p_srec->mx_proto_id == mx_proto_id &&

          service_id == p_srec->service_id && p_name &&

          (!strncmp(p_name, (char*)p_srec->orig_service_name,

                    BTM_SEC_SERVICE_NAME_LEN) ||

                    /* strlcpy replaces end char with termination char*/

                    BTM_SEC_SERVICE_NAME_LEN - 1) ||

           !strncmp(p_name, (char*)p_srec->term_service_name,

                    BTM_SEC_SERVICE_NAME_LEN)))

                    /* strlcpy replaces end char with termination char*/

                    BTM_SEC_SERVICE_NAME_LEN - 1)))

#else

      if (p_srec->psm == psm && p_srec->mx_proto_id == mx_proto_id &&

          service_id == p_srec->service_id)