From: Michael Altizer <mialtize@cisco.com>
Date: Tue, 5 Apr 2016 19:47:19 +0000 (-0400)
Subject: snort2lua: Fix more memory leaks
X-Git-Tag: 3.0.0-233~476^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868dd064c0abf8416bd06bacefa85f784b8dd07f;p=thirdparty%2Fsnort3.git

snort2lua: Fix more memory leaks
---

diff --git a/tools/snort2lua/data/data_types/dt_rule_option.cc b/tools/snort2lua/data/data_types/dt_rule_option.cc
index c7c95d5c3..feb7ebbf1 100644
--- a/tools/snort2lua/data/data_types/dt_rule_option.cc
+++ b/tools/snort2lua/data/data_types/dt_rule_option.cc
@@ -32,6 +32,8 @@ RuleOption::RuleOption(std::string n, std::string v)
 
 RuleOption::~RuleOption()
 {
+    for (auto rso : sub_options)
+        delete rso;
 }
 
 bool RuleOption::add_suboption(std::string subopt_name)
diff --git a/tools/snort2lua/helpers/converter.cc b/tools/snort2lua/helpers/converter.cc
index dfd58ad0d..2e630ebf0 100644
--- a/tools/snort2lua/helpers/converter.cc
+++ b/tools/snort2lua/helpers/converter.cc
@@ -22,6 +22,8 @@
 #include "helpers/converter.h"
 #include "conversion_state.h"
 #include "data/data_types/dt_comment.h"
+#include "data/data_types/dt_rule.h"
+#include "data/data_types/dt_table.h"
 #include "helpers/s2l_util.h"
 #include "init_state.h"
 
@@ -133,6 +135,12 @@ int Converter::parse_include_file(std::string input_file)
             rule_api.include_rule_file(input_file + ".rules");
     }
 
+    for (auto r : rules)
+        delete r;
+
+    for (auto t : tables)
+        delete t;
+
     return rc;
 }