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

Commit 74f06b1c authored by Archie Pusaka's avatar Archie Pusaka Committed by Automerger Merge Worker
Browse files

Merge "btif_sock: prevent crash from logging NULL UUIDs" into main am: 5efca0d6 

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



Change-Id: Ibc32a0202f97af09f5f789cc50b1410a203edd4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7473fa08 5efca0d6

system/btif/src/btif_sock.cc

+5 −4
Original line number Diff line number Diff line
@@ -213,9 +213,10 @@ static bt_status_t btsock_connect(const RawAddress* bd_addr, btsock_type_t type, 
  *sock_fd = INVALID_FD;

  bt_status_t status = BT_STATUS_FAIL;



  btif_sock_connection_logger(

      *bd_addr, 0, type, SOCKET_CONNECTION_STATE_CONNECTING,

      SOCKET_ROLE_CONNECTION, app_uid, channel, 0, 0, uuid->ToString().c_str());

  btif_sock_connection_logger(*bd_addr, 0, type,

                              SOCKET_CONNECTION_STATE_CONNECTING,

                              SOCKET_ROLE_CONNECTION, app_uid, channel, 0, 0,

                              uuid ? uuid->ToString().c_str() : "");

  switch (type) {

    case BTSOCK_RFCOMM:

      status =
@@ -246,7 +247,7 @@ static bt_status_t btsock_connect(const RawAddress* bd_addr, btsock_type_t type, 
    btif_sock_connection_logger(*bd_addr, 0, type,

                                SOCKET_CONNECTION_STATE_DISCONNECTED,

                                SOCKET_ROLE_CONNECTION, app_uid, channel, 0, 0,

                                uuid->ToString().c_str());

                                uuid ? uuid->ToString().c_str() : "");

  }

  return status;

}