diff --git a/src/fuzzers/fuzzer-setup.h b/src/fuzzers/fuzzer-setup.h index 3c2d20f18f..b61f6db99d 100644 --- a/src/fuzzers/fuzzer-setup.h +++ b/src/fuzzers/fuzzer-setup.h @@ -88,7 +88,7 @@ void fuzzer_cleanup_one_input() { zeek::event_mgr.Drain(); zeek::session_mgr->Drain(); zeek::event_mgr.Drain(); - zeek::session_mgr->Clear(); + zeek::session_mgr->Done(); run_state::terminating = false; } diff --git a/src/session/Manager.cc b/src/session/Manager.cc index 131805ef85..82c61b108a 100644 --- a/src/session/Manager.cc +++ b/src/session/Manager.cc @@ -82,12 +82,9 @@ Manager::Manager() { }); } -Manager::~Manager() { - Clear(); - delete stats; -} +Manager::~Manager() { delete stats; } -void Manager::Done() {} +void Manager::Done() { Clear(); } Connection* Manager::FindConnection(Val* v) { zeek::detail::ConnKey conn_key(v); diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index ba5dc89e1f..ad9a579243 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -391,7 +391,6 @@ static void terminate_zeek() { event_mgr.Drain(); - session_mgr->Clear(); plugin_mgr->FinishPlugins(); finish_script_execution();