rtos/riot: fix out-of-bounds read of optional symbols array

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

diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c
index 710436b7423b23bd3c0f270773116661b2e6dc2d..754470e3c6e2cb10e12f8a21a5fc173419618bac 100644 (file)
--- a/src/rtos/mqx.c
+++ b/src/rtos/mqx.c
@@ -260,7 +260,7 @@ static int mqx_create(
 {
        /* check target name against supported architectures */
        for (unsigned int i = 0; i < ARRAY_SIZE(mqx_params_list); i++) {
-               if (0 == strcmp(mqx_params_list[i].target_name, target->type->name)) {
+               if (strcmp(mqx_params_list[i].target_name, target->type->name) == 0) {
                        target->rtos->rtos_specific_params = (void *)&mqx_params_list[i];
                        /* LOG_DEBUG("MQX RTOS - valid architecture: %s", target->type->name); */
                        return 0;
@@ -291,7 +291,7 @@ static int mqx_update_threads(
        /* clear old data */
        rtos_free_threadlist(rtos);
        /* check scheduler */
-       if (ERROR_OK != mqx_is_scheduler_running(rtos))
+       if (mqx_is_scheduler_running(rtos) != ERROR_OK)
                return ERROR_FAIL;
        /* get kernel_data symbol */
        if (mqx_get_symbol(rtos, MQX_VAL_MQX_KERNEL_DATA, &kernel_data_addr) != ERROR_OK)
@@ -393,7 +393,7 @@ static int mqx_update_threads(
                rtos->thread_details[i].exists = true;
                /* set thread name */
                rtos->thread_details[i].thread_name_str = malloc(strlen((void *)task_name) + 1);
-               if (NULL == rtos->thread_details[i].thread_name_str)
+               if (!rtos->thread_details[i].thread_name_str)
                        return ERROR_FAIL;
                strcpy(rtos->thread_details[i].thread_name_str, (void *)task_name);
                /* set thread extra info
@@ -405,7 +405,7 @@ static int mqx_update_threads(
                 */
                extra_info_length += strlen((void *)state_name) + 7 + 13 + 8 + 15 + 8;
                rtos->thread_details[i].extra_info_str = malloc(extra_info_length + 1);
-               if (NULL == rtos->thread_details[i].extra_info_str)
+               if (!rtos->thread_details[i].extra_info_str)
                        return ERROR_FAIL;
                snprintf(rtos->thread_details[i].extra_info_str, extra_info_length,
                         "State: %s, Address: 0x%" PRIx32 ",  Error Code: %" PRIu32,
@@ -438,7 +438,7 @@ static int mqx_get_thread_reg_list(
                LOG_ERROR("MQX RTOS - invalid threadid: 0x%X", (int)thread_id);
                return ERROR_FAIL;
        }
-       if (ERROR_OK != mqx_is_scheduler_running(rtos))
+       if (mqx_is_scheduler_running(rtos) != ERROR_OK)
                return ERROR_FAIL;
        /* get kernel_data symbol */
        if (mqx_get_symbol(rtos, MQX_VAL_MQX_KERNEL_DATA, &kernel_data_addr) != ERROR_OK)
@@ -501,7 +501,7 @@ static int mqx_get_thread_reg_list(
 static int mqx_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[])
 {
        *symbol_list = calloc(ARRAY_SIZE(mqx_symbol_list), sizeof(struct symbol_table_elem));
-       if (NULL == *symbol_list)
+       if (!*symbol_list)
                return ERROR_FAIL;
        /* export required symbols */
        for (int i = 0; i < (int)(ARRAY_SIZE(mqx_symbol_list)); i++)