Merge pull request #239 from VIPnytt/refactor-memory-management

Refactor memory management to use std::vector

Author: JanPetterMG

firmware/src/extensions/HomeAssistantExtension.cpp

@@ -88,12 +88,11 @@ void HomeAssistantExtension::begin()
         }
     }
     const size_t length = measureJson(*discovery);
-    uint8_t *payload = new uint8_t[length];
-    serializeJson(*discovery, payload, length);
+    std::vector<uint8_t> payload(length + 1);
+    serializeJson(*discovery, payload.data(), length + 1);
     delete discovery;
     discovery = nullptr;
-    Mqtt->client.publish(discoveryTopic.c_str(), 0, true, payload, length);
-    delete[] payload;
+    Mqtt->client.publish(discoveryTopic.c_str(), 0, true, payload.data(), length);
 }
 
 void HomeAssistantExtension::handle()

firmware/src/extensions/MqttExtension.cpp

@@ -92,10 +92,9 @@ void MqttExtension::onDisconnect(espMqttClientTypes::DisconnectReason reason)
 void MqttExtension::onTransmit(const JsonDocument &doc, const char *const source)
 {
     const size_t length = measureJson(doc);
-    uint8_t *payload = new uint8_t[length + 1];
-    serializeJson(doc, reinterpret_cast<char *>(payload), length + 1);
-    client.publish(std::string("frekvens/" HOSTNAME "/").append(source).c_str(), doc["event"].isUnbound() ? 0 : 2, false, payload, length);
-    delete[] payload;
+    std::vector<char> payload(length + 1);
+    serializeJson(doc, payload.data(), length + 1);
+    client.publish(std::string("frekvens/" HOSTNAME "/").append(source).c_str(), doc["event"].isUnbound() ? 0 : 2, false, reinterpret_cast<const uint8_t *>(payload.data()), length);
 }
 
 #endif // EXTENSION_MQTT

firmware/src/extensions/PlaylistExtension.cpp

@@ -23,12 +23,13 @@ void PlaylistExtension::configure()
     if (Storage.isKey("modes"))
     {
         const size_t length = Storage.getBytesLength("modes");
-        uint8_t *buffer = new uint8_t[length];
-        Storage.getBytes("modes", buffer, length);
+        std::vector<uint8_t> buffer(length);
+        Storage.getBytes("modes", buffer.data(), length);
         Storage.end();
-        deserializeJson(doc, buffer, length);
-        delete[] buffer;
-        for (JsonVariantConst item : doc.as<JsonArrayConst>())
+        deserializeJson(doc, buffer.data(), length);
+        JsonArrayConst modes = doc.as<JsonArrayConst>();
+        playlist.reserve(modes.size());
+        for (JsonVariantConst item : modes)
         {
             PlaylistExtension::Mode mode;
             mode.duration = item["duration"].as<uint16_t>();
@@ -147,13 +148,12 @@ void PlaylistExtension::setPlaylist(std::vector<PlaylistExtension::Mode> modes)
         playlist.push_back(mode);
     }
     const size_t length = measureJson(doc);
-    uint8_t *buffer = new uint8_t[length + 1];
-    serializeJson(doc, reinterpret_cast<char *>(buffer), length + 1);
+    std::vector<uint8_t> buffer(length + 1);
+    serializeJson(doc, reinterpret_cast<char *>(buffer.data()), length + 1);
     Preferences Storage;
     Storage.begin(name);
-    Storage.putBytes("modes", buffer, length + 1);
+    Storage.putBytes("modes", buffer.data(), length + 1);
     Storage.end();
-    delete[] buffer;
     transmit();
 }
 

firmware/src/extensions/ServerSentEventsExtension.cpp

@@ -23,10 +23,9 @@ void ServerSentEventsExtension::begin()
 void ServerSentEventsExtension::onTransmit(const JsonDocument &doc, const char *const source)
 {
     const size_t length = measureJson(doc);
-    char *payload = new char[length + 1];
-    serializeJson(doc, payload, length + 1);
-    client->send(payload, source);
-    delete[] payload;
+    std::vector<char> payload(length + 1);
+    serializeJson(doc, payload.data(), length + 1);
+    client->send(payload.data(), source);
 }
 
 void ServerSentEventsExtension::onConnect(AsyncEventSourceClient *client)
@@ -35,10 +34,9 @@ void ServerSentEventsExtension::onConnect(AsyncEventSourceClient *client)
     for (const JsonPairConst &pair : doc.as<JsonObjectConst>())
     {
         const size_t length = measureJson(pair.value());
-        char *payload = new char[length + 1];
-        serializeJson(pair.value(), payload, length + 1);
-        client->send(payload, pair.key().c_str());
-        delete[] payload;
+        std::vector<char> payload(length + 1);
+        serializeJson(pair.value(), payload.data(), length + 1);
+        client->send(payload.data(), pair.key().c_str());
     }
 }
 

firmware/src/extensions/WebSocketExtension.cpp

@@ -27,10 +27,9 @@ void WebSocketExtension::onTransmit(const JsonDocument &doc, const char *const s
     JsonDocument _doc;
     _doc[source] = doc;
     const size_t length = measureJson(_doc);
-    char *payload = new char[length + 1];
-    serializeJson(_doc, payload, length + 1);
-    server->textAll(payload, length);
-    delete[] payload;
+    std::vector<char> payload(length + 1);
+    serializeJson(_doc, payload.data(), length + 1);
+    server->textAll(payload.data(), length);
 }
 
 void WebSocketExtension::onEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
@@ -41,10 +40,9 @@ void WebSocketExtension::onEvent(AsyncWebSocket *server, AsyncWebSocketClient *c
     {
         const JsonDocument doc = Device.getTransmits();
         const size_t length = measureJson(doc);
-        char *payload = new char[length + 1];
-        serializeJson(doc, payload, length + 1);
-        client->text(payload, length);
-        delete[] payload;
+        std::vector<char> payload(length + 1);
+        serializeJson(doc, payload.data(), length + 1);
+        client->text(payload.data(), length);
     }
     break;
     case AwsEventType::WS_EVT_DATA:

firmware/src/services/ConnectivityService.cpp

@@ -115,10 +115,9 @@ void ConnectivityService::initStation()
     if (Storage.isKey("Wi-Fi"))
     {
         const size_t _length = Storage.getBytesLength("Wi-Fi");
-        uint8_t *_buffer = new uint8_t[_length];
-        Storage.getBytes("Wi-Fi", _buffer, _length);
-        deserializeJson(doc, _buffer, _length);
-        delete[] _buffer;
+        std::vector<char> _buffer(_length);
+        Storage.getBytes("Wi-Fi", _buffer.data(), _length);
+        deserializeJson(doc, _buffer.data(), _length);
     }
     wifi_config_t config;
     if (!esp_wifi_get_config(wifi_interface_t::WIFI_IF_STA, &config))
@@ -137,11 +136,10 @@ void ConnectivityService::initStation()
         doc[WIFI_SSID] = WIFI_KEY;
     }
     const size_t length = measureJson(doc);
-    uint8_t *buffer = new uint8_t[length + 1];
-    serializeJson(doc, reinterpret_cast<char *>(buffer), length + 1);
-    Storage.putBytes("Wi-Fi", buffer, length + 1);
+    std::vector<uint8_t> buffer(length + 1);
+    serializeJson(doc, reinterpret_cast<char *>(buffer.data()), length + 1);
+    Storage.putBytes("Wi-Fi", buffer.data(), length + 1);
     Storage.end();
-    delete[] buffer;
     for (const JsonPairConst &credentials : doc.as<JsonObjectConst>())
     {
         multi.addAP(credentials.key().c_str(), credentials.value().as<const char *>());
@@ -292,19 +290,18 @@ void ConnectivityService::transmit()
         if (Storage.isKey("saved"))
         {
             const size_t len = Storage.getBytesLength("saved");
-            uint8_t *buf = new uint8_t[len];
-            Storage.getBytes("saved", buf, len);
+            std::vector<uint8_t> buf(len);
+            Storage.getBytes("saved", buf.data(), len);
             Storage.end();
             JsonDocument _saved;
-            if (!deserializeJson(_saved, buf, len))
+            if (!deserializeJson(_saved, buf.data(), len))
             {
                 JsonArray saved = doc["saved"].to<JsonArray>();
                 for (const JsonPairConst &credentials : _saved.as<JsonObjectConst>())
                 {
                     saved.add(credentials.key());
                 }
             }
-            delete[] buf;
         }
         else
         {

firmware/src/services/DisplayService.cpp

@@ -141,7 +141,7 @@ DisplayService::Orientation DisplayService::getOrientation() const
 
 void DisplayService::setOrientation(Orientation orientation)
 {
-    uint8_t _pixel[GRID_COLUMNS * GRID_ROWS];
+    std::vector<uint8_t> _pixel(GRID_COLUMNS * GRID_ROWS);
     switch ((orientation - this->orientation + 4) % 4)
     {
     case Orientation::deg180:
@@ -168,7 +168,7 @@ void DisplayService::setOrientation(Orientation orientation)
         return;
     }
     ESP_LOGI(name, "orientation %d°", orientation * 90);
-    memcpy(pixel, _pixel, sizeof(_pixel));
+    memcpy(pixel, _pixel.data(), _pixel.size());
     this->orientation = orientation;
 #if GRID_COLUMNS == GRID_ROWS
     ratio = this->orientation % 2