Fix memory leaks on the collections/variables management

headers/modsecurity/transaction/variables.h

@@ -40,6 +40,7 @@ class Variables :
     public std::unordered_multimap<std::string, std::string> {
  public:
     Variables();
+    ~Variables();
     void store(std::string key, std::string value);
 
     bool storeOrUpdateFirst(const std::string &key,

src/collections.cc

@@ -37,7 +37,12 @@ Collections::Collections() {
 }
 
 
-Collections::~Collections() { }
+Collections::~Collections() {
+    for (auto &a : *this) {
+        this->erase(a.first);
+        delete a.second;
+    }
+}
 
 
 void Collections::init(const std::string& name, const std::string& key) {

src/transaction.cc

@@ -148,10 +148,6 @@ Transaction::~Transaction() {
     m_requestBody.str(std::string());
     m_requestBody.clear();
 
-    for (auto &a : m_collections) {
-        delete a.second;
-    }
-
     m_rules->decrementReferenceCount();
 }
 

src/variables.cc

@@ -34,6 +34,11 @@ Variables::Variables() {
     this->reserve(1000);
 }
 
+Variables::~Variables() {
+    for (auto &a : *this) {
+        this->erase(a.first);
+    }
+}
 
 void Variables::store(std::string key, std::string value) {
     this->emplace(key, value);