Merge branch 'fix_client_destroy' into 'master'

euripedesrocha · euripedesrocha · commit 942fd027f250 · 2024-10-23T20:28:34.000+08:00
fix: Race condition when using destroy

See merge request espressif/esp-mqtt!223
diff --git a/mqtt_client.c b/mqtt_client.c
@@ -1763,8 +1763,8 @@ static void esp_mqtt_task(void *pv)
     }
     esp_transport_close(client->transport);
     outbox_delete_all_items(client->outbox);
-    xEventGroupSetBits(client->status_bits, STOPPED_BIT);
     client->state = MQTT_STATE_DISCONNECTED;
+    xEventGroupSetBits(client->status_bits, STOPPED_BIT);
 
     vTaskDelete(NULL);
 }

Original file line number	Diff line number	Diff line change
`@@ -1763,8 +1763,8 @@ static void esp_mqtt_task(void *pv)`
`1763`	`1763`	`}`
`1764`	`1764`	`esp_transport_close(client->transport);`
`1765`	`1765`	`outbox_delete_all_items(client->outbox);`
`1766`		`- xEventGroupSetBits(client->status_bits, STOPPED_BIT);`
`1767`	`1766`	`client->state = MQTT_STATE_DISCONNECTED;`
	`1767`	`+ xEventGroupSetBits(client->status_bits, STOPPED_BIT);`
`1768`	`1768`
`1769`	`1769`	`vTaskDelete(NULL);`
`1770`	`1770`	`}`