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

Commit da92fe80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "HFP: Avoid double free SDP" am: 6180b2b1 

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

Change-Id: I63e3de3aea88d338fe298b6c4a5fb6b7a229106b
parents 45ee590c 6180b2b1

system/bta/hf_client/bta_hf_client_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void bta_hf_client_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, 
    /* Cancel SDP if it had been started. */

    if (client_cb->p_disc_db) {

      (void)SDP_CancelServiceSearch(client_cb->p_disc_db);

      osi_free_and_reset((void**)&client_cb->p_disc_db);

      bta_hf_client_free_db(NULL);

    }



    /* reopen registered server */

system/bta/hf_client/bta_hf_client_rfc.cc

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ void bta_hf_client_rfc_do_close(tBTA_HF_CLIENT_DATA* p_data) { 
    /* Cancel SDP if it had been started. */

    if (client_cb->p_disc_db) {

      (void)SDP_CancelServiceSearch(client_cb->p_disc_db);

      osi_free_and_reset((void**)&client_cb->p_disc_db);

      bta_hf_client_free_db(NULL);

    }

  }

}

system/bta/hf_client/bta_hf_client_sdp.cc

+1 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ void bta_hf_client_do_disc(tBTA_HF_CLIENT_CB* client_cb) { 


  if (!db_inited) {

    /*free discover db */

    osi_free_and_reset((void**)&client_cb->p_disc_db);

    bta_hf_client_free_db(NULL);

    /* sent failed event */

    tBTA_HF_CLIENT_DATA msg;

    msg.hdr.layer_specific = client_cb->handle;
@@ -355,7 +355,6 @@ void bta_hf_client_do_disc(tBTA_HF_CLIENT_CB* client_cb) { 
 *

 ******************************************************************************/

void bta_hf_client_free_db(tBTA_HF_CLIENT_DATA* p_data) {

  CHECK(p_data != NULL);

  tBTA_HF_CLIENT_CB* client_cb =

      bta_hf_client_find_cb_by_handle(p_data->hdr.layer_specific);

  if (client_cb == NULL) {