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

Commit 0aa2a703 authored by Matthew Xie's avatar Matthew Xie Committed by Gerrit Code Review
Browse files

Merge "Bluetooth:GAP: Add NULL check before accessing accept socket"

parents b60bef57 f1d27225

system/btif/src/btif_sock_rfc.c

+29 −20
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ static inline rfc_slot_t* create_srv_accept_rfc_slot(rfc_slot_t* srv_rs, const b 
                                        int open_handle, int new_listen_handle)

{

    rfc_slot_t *accept_rs = alloc_rfc_slot(addr, srv_rs->service_name, srv_rs->service_uuid, srv_rs->scn, 0, FALSE);

    if( accept_rs)

    {

        clear_slot_flag(&accept_rs->f);

        accept_rs->f.server = FALSE;

        accept_rs->f.connected = TRUE;
@@ -302,8 +304,15 @@ static inline rfc_slot_t* create_srv_accept_rfc_slot(rfc_slot_t* srv_rs, const b 
        uint32_t new_listen_id = accept_rs->id;

        accept_rs->id = srv_rs->id;

        srv_rs->id = new_listen_id;



        return accept_rs;

    }

    else

    {

        APPL_TRACE_ERROR1(" accept_rs is NULL %s", __FUNCTION__);

        return NULL;

    }

}

bt_status_t btsock_rfc_listen(const char* service_name, const uint8_t* service_uuid, int channel,

                            int* sock_fd, int flags)

{