rtos/mqx: prevent crash with -rtos auto

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

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 2f5d2fb9259d43aea3f3499ecd2f1fd5c7474c66..c28236d37cf65a3d3eb9754bf74b0df05da67319 100644 (file)
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -40,7 +40,7 @@
 #define MAX_THREADS 200
 /*  specific task  */
 struct linux_os {
-       char *name;
+       const char *name;
        uint32_t init_task_addr;
        int thread_count;
        int threadid_count;
@@ -254,7 +254,7 @@ static int linux_os_thread_reg_list(struct rtos *rtos,
 
        } else {
                struct threads *temp = linux_os->thread_list;
-               *hex_reg_list = (char *)calloc(1, 500 * sizeof(char));
+               *hex_reg_list = calloc(1, 500 * sizeof(char));
                hex_string = *hex_reg_list;
 
                for (i = 0; i < 16; i++)
@@ -320,7 +320,7 @@ static int linux_os_detect(struct target *target)
 static int linux_os_smp_init(struct target *target);
 static int linux_os_clean(struct target *target);
 #define INIT_TASK 0
-static char *linux_symbol_list[] = {
+static const char * const linux_symbol_list[] = {
        "init_task",
        NULL
 };
@@ -329,7 +329,7 @@ static int linux_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
 {
        unsigned int i;
        *symbol_list = (symbol_table_elem_t *)
-               malloc(sizeof(symbol_table_elem_t) * ARRAY_SIZE(linux_symbol_list));
+               calloc(ARRAY_SIZE(linux_symbol_list), sizeof(symbol_table_elem_t));
 
        for (i = 0; i < ARRAY_SIZE(linux_symbol_list); i++)
                (*symbol_list)[i].symbol_name = linux_symbol_list[i];
@@ -1136,7 +1136,7 @@ int linux_gdb_thread_packet(struct target *target,
        if (retval != ERROR_OK)
                return ERROR_TARGET_FAILURE;
 
-       char *out_str = (char *)calloc(1, 350 * sizeof(int64_t));
+       char *out_str = calloc(1, 350 * sizeof(int64_t));
        char *tmp_str = out_str;
        tmp_str += sprintf(tmp_str, "m");
        struct threads *temp = linux_os->thread_list;
@@ -1149,6 +1149,7 @@ int linux_gdb_thread_packet(struct target *target,
        }
 
        gdb_put_packet(connection, out_str, strlen(out_str));
+       free(out_str);
        return ERROR_OK;
 }
 
@@ -1172,7 +1173,7 @@ int linux_gdb_thread_update(struct target *target,
 
        if (found == 1) {
                /*LOG_INFO("INTO GDB THREAD UPDATE FOUNDING START TASK");*/
-               char *out_strr = (char *)calloc(1, 350 * sizeof(int64_t));
+               char *out_strr = calloc(1, 350 * sizeof(int64_t));
                char *tmp_strr = out_strr;
                tmp_strr += sprintf(tmp_strr, "m");
                /*LOG_INFO("CHAR MALLOC & M DONE");*/
@@ -1216,7 +1217,7 @@ int linux_thread_extra_info(struct target *target,
                        char *pid_current = "*PID: ";
                        char *name = "NAME: ";
                        int str_size = strlen(pid) + strlen(name);
-                       char *tmp_str = (char *)calloc(1, str_size + 50);
+                       char *tmp_str = calloc(1, str_size + 50);
                        char *tmp_str_ptr = tmp_str;
 
                        /*  discriminate current task */
@@ -1231,7 +1232,7 @@ int linux_thread_extra_info(struct target *target,
                        tmp_str_ptr += sprintf(tmp_str_ptr, "%s", " | ");
                        sprintf(tmp_str_ptr, "%s", name);
                        sprintf(tmp_str_ptr, "%s", temp->name);
-                       char *hex_str = (char *)calloc(1, strlen(tmp_str) * 2 + 1);
+                       char *hex_str = calloc(1, strlen(tmp_str) * 2 + 1);
                        int pkt_len = hexify(hex_str, tmp_str, 0, strlen(tmp_str) * 2 + 1);
                        gdb_put_packet(connection, hex_str, pkt_len);
                        free(hex_str);