openocd: avoid checking for non NULL pointer to free it

[openocd.git] / src / rtos / linux.c

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 74172b70a43c189b27d69cfe9e5e33f9c8cf72e0..dbbf97b4467ae2a3de26c6345b7cb6783a97b288 100644 (file)
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -188,7 +188,7 @@ static int linux_os_thread_reg_list(struct rtos *rtos,
                return ERROR_FAIL;
        }
 
-       /*  search target to perfom the access  */
+       /*  search target to perform the access  */
        struct reg **gdb_reg_list;
        struct target_list *head;
        head = target->head;
@@ -621,17 +621,16 @@ struct threads *liste_del_task(struct threads *task_list, struct threads **t,
        struct threads *prev)
 {
        LOG_INFO("del task %" PRId64, (*t)->threadid);
-       prev->next = (*t)->next;
-
-       if (prev == task_list)
-               task_list = prev;
+       if (prev)
+               prev->next = (*t)->next;
+       else
+               task_list = (*t)->next;
 
        /*  free content of threads */
-       if ((*t)->context)
-               free((*t)->context);
+       free((*t)->context);
 
        free(*t);
-       *t = prev;
+       *t = prev ? prev : task_list;
        return task_list;
 }
 
@@ -725,6 +724,7 @@ int linux_get_tasks(struct target *target, int context)
 
                /*  check that this thread is not one the current threads already
                 *  created */
+               uint32_t base_addr;
 #ifdef PID_CHECK
 
                if (!current_pid(linux_os, t->pid)) {
@@ -745,12 +745,13 @@ int linux_get_tasks(struct target *target, int context)
                                t->context =
                                        cpu_context_read(target, t->base_addr,
                                                &t->thread_info_addr);
+                       base_addr = next_task(target, t);
                } else {
                        /*LOG_INFO("thread %s is a current thread already created",t->name); */
+                       base_addr = next_task(target, t);
                        free(t);
                }
 
-               uint32_t base_addr = next_task(target, t);
                t = calloc(1, sizeof(struct threads));
                t->base_addr = base_addr;
        }
@@ -779,8 +780,7 @@ static int clean_threadlist(struct target *target)
        while (temp != NULL) {
                old = temp;
 
-               if (temp->context)
-                       free(temp->context);
+               free(temp->context);
 
                temp = temp->next;
                free(old);
@@ -929,10 +929,8 @@ static int linux_task_update(struct target *target, int context)
        while (thread_list != NULL) {
                thread_list->status = 0;        /*setting all tasks to dead state*/
 
-               if (thread_list->context) {
-                       free(thread_list->context);
-                       thread_list->context = NULL;
-               }
+               free(thread_list->context);
+               thread_list->context = NULL;
 
                thread_list = thread_list->next;
        }
@@ -993,10 +991,8 @@ static int linux_task_update(struct target *target, int context)
                                        if (context)
                                                thread_list->context =
                                                        cpu_context_read(target,
-                                                               thread_list->
-                                                               base_addr,
-                                                               &thread_list->
-                                                               thread_info_addr);
+                                                               thread_list->base_addr,
+                                                               &thread_list->thread_info_addr);
                                } else {
                                        /*  it is a current thread no need to read context */
                                }
@@ -1178,7 +1174,7 @@ int linux_gdb_T_packet(struct connection *connection,
 
        if (linux_os->threads_needs_update == 0) {
                struct threads *temp = linux_os->thread_list;
-               struct threads *prev = linux_os->thread_list;
+               struct threads *prev = NULL;
 
                while (temp != NULL) {
                        if (temp->threadid == threadid) {
@@ -1188,9 +1184,8 @@ int linux_gdb_T_packet(struct connection *connection,
                                } else {
                                        /* delete item in the list   */
                                        linux_os->thread_list =
-                                               liste_del_task(linux_os->
-                                                       thread_list, &temp,
-                                                       prev);
+                                               liste_del_task(linux_os->thread_list,
+                                                       &temp, prev);
                                        linux_os->thread_count--;
                                        gdb_put_packet(connection, "E01", 3);
                                        return ERROR_OK;
@@ -1321,9 +1316,7 @@ static int linux_thread_packet(struct connection *connection, char const *packet
                        if (strncmp(packet, "qSymbol", 7) == 0) {
                                if (rtos_qsymbol(connection, packet, packet_size) == 1) {
                                        linux_compute_virt2phys(target,
-                                                       target->rtos->
-                                                       symbols[INIT_TASK].
-                                                       address);
+                                                       target->rtos->symbols[INIT_TASK].address);
                                }
 
                                break;
@@ -1374,11 +1367,10 @@ static int linux_thread_packet(struct connection *connection, char const *packet
                                }
 
                                if ((ct != NULL) && (ct->threadid !=
-                                                target->rtos->
-                                                current_threadid)
+                                                target->rtos->current_threadid)
                                && (target->rtos->current_threadid != -1))
-                                       LOG_WARNING("WARNING! current GDB thread do not match" \
-                                                       "current thread running." \
+                                       LOG_WARNING("WARNING! current GDB thread do not match "
+                                                       "current thread running. "
                                                        "Switch thread in GDB to threadid %d",
                                                        (int)ct->threadid);
 
@@ -1408,8 +1400,7 @@ static int linux_os_smp_init(struct target *target)
        while (head != (struct target_list *)NULL) {
                if (head->target->rtos != rtos) {
                        struct linux_os *smp_os_linux =
-                               (struct linux_os *)head->target->rtos->
-                               rtos_specific_params;
+                               (struct linux_os *)head->target->rtos->rtos_specific_params;
                        /*  remap smp target on rtos  */
                        free(head->target->rtos);
                        head->target->rtos = rtos;