update(userspace/engine): handle formatters with smart pointer

Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com> Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
falcosecurity · Oct 16, 2020 · b2a2623 · b2a2623
1 parent cd2e66f
commit b2a2623
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/userspace/engine/formats.cpp b/userspace/engine/formats.cpp
@@ -24,7 +24,7 @@ sinsp *falco_formats::s_inspector = NULL;
 falco_engine *falco_formats::s_engine = NULL;
 bool falco_formats::s_json_output = false;
 bool falco_formats::s_json_include_output_property = true;
-sinsp_evt_formatter_cache *falco_formats::s_formatters = NULL;
+std::unique_ptr<sinsp_evt_formatter_cache> falco_formats::s_formatters = NULL;
 
 const static struct luaL_reg ll_falco[] =
 	{
@@ -42,11 +42,9 @@ void falco_formats::init(sinsp *inspector,
 	s_engine = engine;
 	s_json_output = json_output;
 	s_json_include_output_property = json_include_output_property;
-	if(!s_formatters)
-	{
-		delete(s_formatters);
-	}
-	s_formatters = new sinsp_evt_formatter_cache(s_inspector);
+
+	// todo(leogr): we should have used std::make_unique, but we cannot since it's not C++14
+	s_formatters = std::unique_ptr<sinsp_evt_formatter_cache>(new sinsp_evt_formatter_cache(s_inspector));
 
 	luaL_openlib(ls, "formats", ll_falco, 0);
 }

diff --git a/userspace/engine/formats.h b/userspace/engine/formats.h
@@ -53,7 +53,7 @@ class falco_formats
 
 	static sinsp *s_inspector;
 	static falco_engine *s_engine;
-	static sinsp_evt_formatter_cache *s_formatters;
+	static std::unique_ptr<sinsp_evt_formatter_cache> s_formatters;
 	static bool s_json_output;
 	static bool s_json_include_output_property;
 };