Set global pointers to null after free

Fixes crash when restarting MQTT.
sparkfun · Mar 21, 2024 · df481a4 · df481a4
1 parent c7466c9
commit df481a4
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Firmware/RTK_Everywhere/MQTT_Client.ino b/Firmware/RTK_Everywhere/MQTT_Client.ino
@@ -437,10 +437,17 @@ void mqttClientStop(bool shutdown)
     }
 
     // Release the buffers
-    if (mqttClientPrivateKeyBuffer)
+    if (mqttClientPrivateKeyBuffer != nullptr)
+    {
         free(mqttClientPrivateKeyBuffer);
-    if (mqttClientCertificateBuffer)
+        mqttClientPrivateKeyBuffer = nullptr;
+    }
+
+    if (mqttClientCertificateBuffer != nullptr)
+    {
         free(mqttClientCertificateBuffer);
+        mqttClientCertificateBuffer = nullptr;
+    }
 
     reportHeapNow(settings.debugMqttClientState);
 
@@ -559,12 +566,14 @@ void mqttClientUpdate()
             if (mqttClientCertificateBuffer)
             {
                 free(mqttClientCertificateBuffer);
+                mqttClientCertificateBuffer = nullptr;
                 systemPrintln("Failed to allocate key buffer!");
             }
 
             if (mqttClientPrivateKeyBuffer)
             {
                 free(mqttClientPrivateKeyBuffer);
+                mqttClientPrivateKeyBuffer = nullptr;
                 systemPrintln("Failed to allocate certificate buffer!");
             }