github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-08-03 07:24:26 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com>
Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
This commit is contained in:
Leonardo Grasso 2020-10-16 13:18:25 +02:00 committed by poiana
parent cebec11552
commit c8703b88bf
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
userspace/engine/formats.cpp
View File

@ -24,7 +24,7 @@ sinsp *falco_formats::s_inspector = NULL;
falco_engine *falco_formats::s_engine = NULL; falco_engine *falco_formats::s_engine = NULL;
bool falco_formats::s_json_output = false; bool falco_formats::s_json_output = false;
bool falco_formats::s_json_include_output_property = true; 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[] = const static struct luaL_reg ll_falco[] =
{ {
@ -42,11 +42,9 @@ void falco_formats::init(sinsp *inspector,
s_engine = engine; s_engine = engine;
s_json_output = json_output; s_json_output = json_output;
s_json_include_output_property = json_include_output_property; s_json_include_output_property = json_include_output_property;
if(!s_formatters)
{ // todo(leogr): we should have used std::make_unique, but we cannot since it's not C++14
delete(s_formatters); s_formatters = std::unique_ptr<sinsp_evt_formatter_cache>(new sinsp_evt_formatter_cache(s_inspector));
}
s_formatters = new sinsp_evt_formatter_cache(s_inspector);
luaL_openlib(ls, "formats", ll_falco, 0); luaL_openlib(ls, "formats", ll_falco, 0);
} }

2
userspace/engine/formats.h
View File

@ -53,7 +53,7 @@ public:
static sinsp *s_inspector; static sinsp *s_inspector;
static falco_engine *s_engine; 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_output;
static bool s_json_include_output_property; static bool s_json_include_output_property;
}; };