rtos/ThreadX: added check for NULL-named tasks

Thread name loading was not correctly handled if a ThreadX task has a NULL
name.

Signed-off-by: Giulio Fieramosca <giulio@glgprograms.it>
Change-Id: I03071930182bc2585b61ce5d8c67491710883dd6
Reviewed-on: https://review.openocd.org/c/openocd/+/7328
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c
index 5f90eb6445d40d2a4a1d5915234d2803f9c21f88..5bdd007d42699bc7aaae7439d93fd9d3709fc275 100644 (file)
--- a/src/rtos/ThreadX.c
+++ b/src/rtos/ThreadX.c
@@ -370,16 +370,21 @@ static int threadx_update_threads(struct rtos *rtos)
                }
 
                /* Read the thread name */
-               retval =
-                       target_read_buffer(rtos->target,
-                               name_ptr,
-                               THREADX_THREAD_NAME_STR_SIZE,
-                               (uint8_t *)&tmp_str);
-               if (retval != ERROR_OK) {
-                       LOG_ERROR("Error reading thread name from ThreadX target");
-                       return retval;
+               tmp_str[0] = '\x00';
+
+               /* Check if thread has a valid name */
+               if (name_ptr != 0) {
+                       retval =
+                               target_read_buffer(rtos->target,
+                                       name_ptr,
+                                       THREADX_THREAD_NAME_STR_SIZE,
+                                       (uint8_t *)&tmp_str);
+                       if (retval != ERROR_OK) {
+                               LOG_ERROR("Error reading thread name from ThreadX target");
+                               return retval;
+                       }
+                       tmp_str[THREADX_THREAD_NAME_STR_SIZE - 1] = '\x00';
                }
-               tmp_str[THREADX_THREAD_NAME_STR_SIZE-1] = '\x00';
 
                if (tmp_str[0] == '\x00')
                        strcpy(tmp_str, "No Name");