Fix a use-after-free during shutdown

This commit is contained in:
Tim Wojtulewicz 2021-07-26 14:26:22 -07:00
parent 6acc3418e0
commit cea9194650
2 changed files with 2 additions and 2 deletions

View file

@ -422,8 +422,6 @@ void delete_run()
{ {
util::detail::set_processing_status("TERMINATING", "delete_run"); util::detail::set_processing_status("TERMINATING", "delete_run");
delete session_mgr;
for ( int i = 0; i < zeek::detail::NUM_ADDR_ANONYMIZATION_METHODS; ++i ) for ( int i = 0; i < zeek::detail::NUM_ADDR_ANONYMIZATION_METHODS; ++i )
delete zeek::detail::ip_anonymizer[i]; delete zeek::detail::ip_anonymizer[i];
} }

View file

@ -64,6 +64,7 @@
#include "zeek/iosource/Manager.h" #include "zeek/iosource/Manager.h"
#include "zeek/broker/Manager.h" #include "zeek/broker/Manager.h"
#include "zeek/telemetry/Manager.h" #include "zeek/telemetry/Manager.h"
#include "zeek/session/Manager.h"
#include "zeek/binpac_zeek.h" #include "zeek/binpac_zeek.h"
#include "zeek/module_util.h" #include "zeek/module_util.h"
@ -334,6 +335,7 @@ static void terminate_bro()
delete reporter; delete reporter;
delete plugin_mgr; delete plugin_mgr;
delete val_mgr; delete val_mgr;
delete session_mgr;
delete fragment_mgr; delete fragment_mgr;
delete telemetry_mgr; delete telemetry_mgr;