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

Commit 65f5fbf2 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Add missing NULL pointers assignments 

Each pointer that was freed by one of the following functions should
be reset to NULL:
 - config_free()
 - data_dispatcher_free()
 - fixed_queue_free()
 - list_free()

Bug: 29421693
Change-Id: Ie55a04ed986393994564edcf872d7413b0767a85
(cherry picked from commit 5b2a7db8)
parent 9c2b0bd7

system/btif/src/btif_hl.c

+1 −0
Original line number Diff line number Diff line
@@ -4768,6 +4768,7 @@ static inline int btif_hl_close_select_thread(void) 
        }

    }

    list_free(soc_queue);

    soc_queue = NULL;



    return (int)result;

}

system/btif/src/btif_sock_rfc.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ void btsock_rfc_cleanup(void) { 
    if (rfc_slots[i].id)

      cleanup_rfc_slot(&rfc_slots[i]);

    list_free(rfc_slots[i].incoming_queue);

    rfc_slots[i].incoming_queue = NULL;

  }

  pthread_mutex_unlock(&slot_lock);

}

system/hci/src/hci_layer.c

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static future_t *shut_down() { 
  fixed_queue_free(packet_queue, buffer_allocator->free);

  packet_queue = NULL;

  list_free(commands_pending_response);

  commands_pending_response = NULL;



  pthread_mutex_destroy(&commands_pending_response_lock);
@@ -802,6 +803,7 @@ void hci_layer_cleanup_interface() { 
    interface.do_postload = NULL;



    data_dispatcher_free(interface.event_dispatcher);

    interface.event_dispatcher = NULL;



    interface.set_data_queue = NULL;

    interface.transmit_command = NULL;

system/main/stack_config.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static future_t *init() { 


static future_t *clean_up() {

  config_free(config);

  config = NULL;

  return future_new_immediate(FUTURE_SUCCESS);

}

system/stack/gatt/gatt_utils.c

+1 −0
Original line number Diff line number Diff line
@@ -2285,6 +2285,7 @@ void gatt_cleanup_upon_disc(BD_ADDR bda, UINT16 reason, tBT_TRANSPORT transport) 
        gatt_free_pending_ind(p_tcb);

        gatt_free_pending_enc_queue(p_tcb);

        fixed_queue_free(p_tcb->sr_cmd.multi_rsp_q, NULL);

        p_tcb->sr_cmd.multi_rsp_q = NULL;



        for (i = 0; i < GATT_MAX_APPS; i ++)

        {