build: fix memory leaks

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

diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index c7b46434ba8102823fcb71d0effb25f5b9ce3dc1..1e4ddc532a51c1c68d905f66548d61f122df718b 100644 (file)
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -30,6 +30,8 @@
 #include "helper/log.h"
 #include "rtos_standard_stackings.h"
 
+#define FREERTOS_MAX_PRIORITIES        63
+
 #define FreeRTOS_STRUCT(int_type, ptr_type, list_prev_offset)
 
 struct FreeRTOS_params {
@@ -187,6 +189,10 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                tasks_found++;
                rtos->thread_details = (struct thread_detail *) malloc(
                                sizeof(struct thread_detail) * thread_list_size);
+               if (!rtos->thread_details) {
+                       LOG_ERROR("Error allocating memory for %d threads", thread_list_size);
+                       return ERROR_FAIL;
+               }
                rtos->thread_details->threadid = 1;
                rtos->thread_details->exists = true;
                rtos->thread_details->display_str = NULL;
@@ -202,6 +208,10 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                /* create space for new thread details */
                rtos->thread_details = (struct thread_detail *) malloc(
                                sizeof(struct thread_detail) * thread_list_size);
+               if (!rtos->thread_details) {
+                       LOG_ERROR("Error allocating memory for %d threads", thread_list_size);
+                       return ERROR_FAIL;
+               }
        }
 
        /* Find out how many lists are needed to be read from pxReadyTasksLists, */
@@ -212,10 +222,19 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        (uint8_t *)&max_used_priority);
        if (retval != ERROR_OK)
                return retval;
+       if (max_used_priority > FREERTOS_MAX_PRIORITIES) {
+               LOG_ERROR("FreeRTOS maximum used priority is unreasonably big, not proceeding: %" PRId64 "",
+                       max_used_priority);
+               return ERROR_FAIL;
+       }
 
        symbol_address_t *list_of_lists =
                (symbol_address_t *)malloc(sizeof(symbol_address_t) *
                        (max_used_priority+1 + 5));
+       if (!list_of_lists) {
+               LOG_ERROR("Error allocating memory for %" PRId64 " priorities", max_used_priority);
+               return ERROR_FAIL;
+       }
 
        int num_lists;
        for (num_lists = 0; num_lists <= max_used_priority; num_lists++)
@@ -240,6 +259,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                (uint8_t *)&list_thread_count);
                if (retval != ERROR_OK) {
                        LOG_OUTPUT("Error reading number of threads in FreeRTOS thread list\r\n");
+                       free(list_of_lists);
                        return retval;
                }
 
@@ -254,8 +274,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                param->pointer_width,
                                (uint8_t *)&list_elem_ptr);
                if (retval != ERROR_OK) {
-                       LOG_OUTPUT(
-                               "Error reading first thread item location in FreeRTOS thread list\r\n");
+                       LOG_OUTPUT("Error reading first thread item location in FreeRTOS thread list\r\n");
+                       free(list_of_lists);
                        return retval;
                }
 
@@ -269,8 +289,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                        param->pointer_width,
                                        (uint8_t *)&(rtos->thread_details[tasks_found].threadid));
                        if (retval != ERROR_OK) {
-                               LOG_OUTPUT(
-                                       "Error reading thread list item object in FreeRTOS thread list\r\n");
+                               LOG_OUTPUT("Error reading thread list item object in FreeRTOS thread list\r\n");
+                               free(list_of_lists);
                                return retval;
                        }
 
@@ -285,8 +305,8 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                        FREERTOS_THREAD_NAME_STR_SIZE,
                                        (uint8_t *)&tmp_str);
                        if (retval != ERROR_OK) {
-                               LOG_OUTPUT(
-                                       "Error reading first thread item location in FreeRTOS thread list\r\n");
+                               LOG_OUTPUT("Error reading first thread item location in FreeRTOS thread list\r\n");
+                               free(list_of_lists);
                                return retval;
                        }
                        tmp_str[FREERTOS_THREAD_NAME_STR_SIZE-1] = '\x00';
@@ -319,12 +339,13 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                        param->pointer_width,
                                        (uint8_t *)&list_elem_ptr);
                        if (retval != ERROR_OK) {
-                               LOG_OUTPUT(
-                                       "Error reading next thread item location in FreeRTOS thread list\r\n");
+                               LOG_OUTPUT("Error reading next thread item location in FreeRTOS thread list\r\n");
+                               free(list_of_lists);
                                return retval;
                        }
                }
        }
+
        free(list_of_lists);
        rtos->thread_count = tasks_found;
        return 0;