Fix potential race condition in z_task_cancel

eclipse-zenoh · Dec 10, 2024 · c0c562e · c0c562e
1 parent 17d689f
commit c0c562e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/system/freertos_plus_tcp/system.c b/src/system/freertos_plus_tcp/system.c
@@ -128,10 +128,14 @@ z_result_t _z_task_detach(_z_task_t *task) {
 
 z_result_t _z_task_cancel(_z_task_t *task) {
     xEventGroupSetBits(task->join_event, 1);
+
+    taskENTER_CRITICAL();
     if (task->handle != NULL) {
         vTaskDelete(task->handle);
         task->handle = NULL;
     }
+    taskEXIT_CRITICAL();
+
     return _Z_RES_OK;
 }