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

Commit fd2b7e0f authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-team Robot
Browse files

AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() 

* buffers allocated by osi_malloc() have canary bytes around it and need special method
  osi_free() to free them

Bug: 148107188
Test: manual
Change-Id: Ifcfe494737c47e33755297214d3f637852a8be0b
(cherry picked from commit 3869ccfc)
(cherry picked from commit 964cafb8)
parent 5d043fa4

system/stack/a2dp/a2dp_aac_decoder.cc

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
typedef struct {

  HANDLE_AACDECODER aac_handle;

  bool has_aac_handle;  // True if aac_handle is valid

  INT_PCM* decode_buf;

  INT_PCM* decode_buf = nullptr;

  decoded_data_callback_t decode_callback;

} tA2DP_AAC_DECODER_CB;
@@ -58,7 +58,7 @@ bool a2dp_aac_decoder_init(decoded_data_callback_t decode_callback) { 
void a2dp_aac_decoder_cleanup(void) {

  if (a2dp_aac_decoder_cb.has_aac_handle)

    aacDecoder_Close(a2dp_aac_decoder_cb.aac_handle);

  free(a2dp_aac_decoder_cb.decode_buf);

  osi_free(a2dp_aac_decoder_cb.decode_buf);

  memset(&a2dp_aac_decoder_cb, 0, sizeof(a2dp_aac_decoder_cb));

}