Mqtt: Fixed memory leak when pushing messages to the queue when it is…

… full. (#1612)
SmingHub · Feb 11, 2019 · 81f5d10 · 81f5d10
1 parent e4a8365
commit 81f5d10
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/Sming/SmingCore/Network/MqttClient.cpp b/Sming/SmingCore/Network/MqttClient.cpp
@@ -234,6 +234,10 @@ bool MqttClient::connect(const URL& url, const String& clientName, uint32_t sslO
 
 bool MqttClient::publish(const String& topic, const String& content, uint8_t flags)
 {
+	if(requestQueue.full()) {
+		return false;
+	}
+
 	mqtt_message_t* message = (mqtt_message_t*)malloc(sizeof(mqtt_message_t));
 	mqtt_message_init(message);
 	message->common.type = MQTT_TYPE_PUBLISH;
@@ -255,6 +259,10 @@ bool MqttClient::publish(const String& topic, IDataSourceStream* stream, uint8_t
 		return false;
 	}
 
+	if(requestQueue.full()) {
+		return false;
+	}
+
 	mqtt_message_t* message = (mqtt_message_t*)malloc(sizeof(mqtt_message_t));
 	mqtt_message_init(message);
 	message->common.type = MQTT_TYPE_PUBLISH;
@@ -274,6 +282,10 @@ bool MqttClient::subscribe(const String& topic)
 {
 	debug_d("subscription '%s' registered", topic.c_str());
 
+	if(requestQueue.full()) {
+		return false;
+	}
+
 	mqtt_message_t* message = (mqtt_message_t*)malloc(sizeof(mqtt_message_t));
 	mqtt_message_init(message);
 	message->common.type = MQTT_TYPE_SUBSCRIBE;
@@ -289,6 +301,10 @@ bool MqttClient::unsubscribe(const String& topic)
 {
 	debug_d("unsubscribing from '%s'", topic.c_str());
 
+	if(requestQueue.full()) {
+		return false;
+	}
+
 	mqtt_message_t* message = (mqtt_message_t*)malloc(sizeof(mqtt_message_t));
 	mqtt_message_init(message);
 	message->common.type = MQTT_TYPE_SUBSCRIBE;

diff --git a/Sming/Wiring/FIFO.h b/Sming/Wiring/FIFO.h
@@ -41,6 +41,11 @@ class FIFO : public Countable<T>
       return numberOfElements;
     }
 
+    bool full() const
+    {
+      return (count() >= rawSize);
+    }
+
     const T &operator[](unsigned int index) const
     {
       return raw[index]; /* unsafe */
@@ -67,7 +72,7 @@ FIFO<T, rawSize>::FIFO() : size(rawSize)
 template<typename T, int rawSize>
 bool FIFO<T, rawSize>::enqueue(T element)
 {
-  if (count() >= rawSize)
+  if (full())
   {
     return false;
   }