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

Commit 5b34f2a8 authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Merge "Fix potential OOB access in sdp_db.cc" into udc-dev am: 5e3da511 am: 11b52a05 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22977950



Change-Id: I50d6181566efd73f38e5dad1b21f18291a39c2dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents acda3b31 11b52a05

system/stack/sdp/sdp_db.cc

+8 −0
Original line number Diff line number Diff line
@@ -470,6 +470,14 @@ bool SDP_AddAttributeToRecord(tSDP_RECORD* p_rec, uint16_t attr_id, 
  p_attr->len = attr_len;



  if (p_rec->free_pad_ptr + attr_len >= SDP_MAX_PAD_LEN) {

    if (p_rec->free_pad_ptr >= SDP_MAX_PAD_LEN) {

      SDP_TRACE_ERROR(

          "SDP_AddAttributeToRecord failed: free pad %d equals or exceeds max "

          "padding length %d",

          p_rec->free_pad_ptr, SDP_MAX_PAD_LEN);

      return (false);

    }



    /* do truncate only for text string type descriptor */

    if (attr_type == TEXT_STR_DESC_TYPE) {

      SDP_TRACE_WARNING(