Fix memleak in MQTT code

calaos · Sep 26, 2024 · d2d991f · d2d991f
1 parent b996a5c
commit d2d991f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/bin/calaos_server/IO/Mqtt/MqttExternProc_main.cpp b/src/bin/calaos_server/IO/Mqtt/MqttExternProc_main.cpp
@@ -114,6 +114,7 @@ class MqttProcess: public ExternProcClient
     virtual int procMain();
 
     EXTERN_PROC_CLIENT_CTOR(MqttProcess)
+    virtual ~MqttProcess();
 
 protected:
     MqttClient *m_client;
@@ -125,6 +126,12 @@ class MqttProcess: public ExternProcClient
 
 };
 
+MqttProcess::~MqttProcess()
+{
+    delete m_client;
+    mosqpp::lib_cleanup();
+}
+
 void MqttProcess::readTimeout()
 {
     m_client->loop(0, 1);
@@ -138,8 +145,6 @@ void MqttProcess::messageReceived(const string &msg)
     if (!jroot)
     {
         cWarningDom("mqtt") << "Error parsing json from sub process: " << jerr.text;
-        if (jroot)
-            json_decref(jroot);
         return;
     }
 
@@ -191,6 +196,7 @@ bool MqttProcess::setup(int &argc, char **&argv)
 
     Params p;
     jansson_decode_object(jroot, p);
+    json_decref(jroot);
 
     if (p.Exists("host"))
         host = p["host"];
@@ -235,6 +241,7 @@ bool MqttProcess::setup(int &argc, char **&argv)
         json_object_set_new(root, "payload", json_string((const char*)m->payload));
         cDebugDom("mqtt") << "Send : " << json_dumps(root, 0);
         sendMessage(json_dumps(root, 0));
+        json_decref(root);
     });
 
     return true;