fix(websocket): wait for task on destroy

espressif · Jan 28, 2025 · d252280 · d252280
1 parent e069ae7
commit d252280
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/components/esp_websocket_client/esp_websocket_client.c b/components/esp_websocket_client/esp_websocket_client.c
@@ -768,9 +768,18 @@ esp_err_t esp_websocket_client_destroy(esp_websocket_client_handle_t client)
     if (client == NULL) {
         return ESP_ERR_INVALID_ARG;
     }
+
+    /* A running client cannot be destroyed from the websocket task/event handler */
+    TaskHandle_t running_task = xTaskGetCurrentTaskHandle();
+    if (running_task == client->task_handle) {
+        ESP_LOGE(TAG, "Client cannot be destroyed from websocket task");
+        return ESP_FAIL;
+    }
+
     if (client->run) {
         esp_websocket_client_stop(client);
     }
+    xEventGroupWaitBits(client->status_bits, STOPPED_BIT, false, true, portMAX_DELAY);
     destroy_and_free_resources(client);
     return ESP_OK;
 }