feedc0de/esp-protocols
1
0
Fork 0
forked from espressif/esp-protocols
Code Pull Requests Activity

fix(mdns): Fix potential task delete race

Browse Source 
Need to wait for the task to be deleted before destroy its stack
This commit is contained in:
David Cermak
2025-03-14 08:57:03 +01:00
parent 2e28774228
commit 8ca45f34fa
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common_components/linux_compat/freertos/freertos_linux.c
View File

@ -166,6 +166,8 @@ void vTaskDelete(TaskHandle_t *task)
if (task == NULL) {
pthread_exit(0);
} else {
pthread_cancel((pthread_t)task);
}
void *thread_rval = NULL;
pthread_join((pthread_t)task, &thread_rval);

5
components/mdns/mdns.c
View File

@ -5427,7 +5427,7 @@ static void _mdns_service_task(void *pvParameters)
}
}
_mdns_service_task_handle = NULL;
vTaskDelete(NULL);
vTaskDelay(portMAX_DELAY);
}
static void _mdns_timer_cb(void *arg)
@ -5532,16 +5532,17 @@ static esp_err_t _mdns_service_task_stop(void)
{
_mdns_stop_timer();
if (_mdns_service_task_handle) {
TaskHandle_t task_handle = _mdns_service_task_handle;
mdns_action_t action;
mdns_action_t *a = &action;
action.type = ACTION_TASK_STOP;
if (xQueueSend(_mdns_server->action_queue, &a, (TickType_t)0) != pdPASS) {
vTaskDelete(_mdns_service_task_handle);
_mdns_service_task_handle = NULL;
}
while (_mdns_service_task_handle) {
vTaskDelay(10 / portTICK_PERIOD_MS);
}
vTaskDelete(task_handle);
}
vSemaphoreDelete(_mdns_service_semaphore);
_mdns_service_semaphore = NULL;