fixed up leaks

StoneOrbits · Dec 1, 2023 · 5007336 · 5007336
1 parent b970bd8
commit 5007336
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/VortexEngine/VortexCLI/VortexCLI.cpp b/VortexEngine/VortexCLI/VortexCLI.cpp
@@ -790,6 +790,7 @@ void VortexCLI::dumpJson() const
   }
   JsonPrinter printer;
   printer.printJson(json);
+  delete json;
 }
 
 long VortexCLI::VortexCLICallbacks::checkPinHook(uint32_t pin)

diff --git a/VortexEngine/VortexCLI/VortexJson.cpp b/VortexEngine/VortexCLI/VortexJson.cpp
@@ -19,6 +19,15 @@ const string &JsonString::getValue() const
   return value;
 }
 
+JsonObject::~JsonObject()
+{
+  // Cleanup properties
+  for (auto& pair : properties) {
+    delete pair.second; // Release memory occupied by JsonValue objects
+  }
+  properties.clear(); // Clear the map
+}
+
 void JsonObject::addProperty(const string &key, JsonValue *value)
 {
   properties[key] = value;
@@ -29,6 +38,15 @@ const map<string, JsonValue *> &JsonObject::getProperties() const
   return properties;
 }
 
+JsonArray::~JsonArray()
+{
+  // Cleanup properties
+  for (auto& el : elements) {
+    delete el; // Release memory occupied by JsonValue objects
+  }
+  elements.clear(); // Clear the map
+}
+
 void JsonArray::addElement(JsonValue *value)
 {
   elements.push_back(value);

diff --git a/VortexEngine/VortexCLI/VortexJson.h b/VortexEngine/VortexCLI/VortexJson.h
@@ -33,6 +33,7 @@ class JsonString : public JsonValue
 class JsonObject : public JsonValue
 {
 public:
+  virtual ~JsonObject();
   void addProperty(const std::string &key, JsonValue *value);
   const std::map<std::string, JsonValue *> &getProperties() const;
 
@@ -43,6 +44,7 @@ class JsonObject : public JsonValue
 class JsonArray : public JsonValue
 {
 public:
+  virtual ~JsonArray();
   void addElement(JsonValue *value);
   const std::vector<JsonValue *> &getElements() const;