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

Commit 5bda5fd3 authored by En-Shuo Hsu's avatar En-Shuo Hsu
Browse files

floss: Refine to use osi_free_and_reset 

To simplify codes and guarantee pointers to be set to null.

BUG: 245844505
Tag: #floss
Test: ./build.py
Test: emerge-${BOARD} floss
Test: atest --host net_test_stack_btm
Change-Id: I76b1129232097cb1a7adbc4f58d1e51de90b8d14
parent 0481df98

system/stack/btm/btm_sco_hci.cc

+3 −4
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ struct tBTM_MSBC_PLC { 
  }



  void deinit() {

    if (pl_window) osi_free(pl_window);

    if (pl_window) osi_free_and_reset((void**)&pl_window);

  }



  void handle_bad_frames(const uint8_t** output) {
@@ -450,7 +450,7 @@ struct tBTM_MSBC_INFO { 
    if (msbc_encode_buf) osi_free(msbc_encode_buf);

    if (plc) {

      plc->deinit();

      osi_free(plc);

      osi_free_and_reset((void**)&plc);

    }

  }
@@ -569,8 +569,7 @@ void cleanup() { 
  if (msbc_info == nullptr) return;



  msbc_info->deinit();

  osi_free(msbc_info);

  msbc_info = nullptr;

  osi_free_and_reset((void**)&msbc_info);

}



size_t enqueue_packet(const uint8_t* data, size_t pkt_size) {