Fix f308 - Prevent race condition in wm_SemLock

embhorn · embhorn · commit 20b1560ddb53 · 2026-03-19T10:27:20.000-05:00
diff --git a/src/mqtt_client.c b/src/mqtt_client.c
@@ -201,9 +201,8 @@ static int MqttClient_CancelMessage(MqttClient *client, MqttObject* msg);
         return 0;
     }
 
-    static UINT semstatus;
     int wm_SemLock(wm_Sem *s) {
-        semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);
+        UINT semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);
         if (semstatus != TX_SUCCESS) {
             return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_SYSTEM);
         }

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,8 @@ static int MqttClient_CancelMessage(MqttClient client, MqttObject msg);`
`201`	`201`	`return 0;`
`202`	`202`	`}`
`203`	`203`
`204`		`- static UINT semstatus;`
`205`	`204`	`int wm_SemLock(wm_Sem *s) {`
`206`		`- semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);`
	`205`	`+ UINT semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);`
`207`	`206`	`if (semstatus != TX_SUCCESS) {`
`208`	`207`	`return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_SYSTEM);`
`209`	`208`	`}`