diff --git a/CHANGES b/CHANGES index c0f9e3b1b8..f701245358 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4.2.0-dev.50 | 2021-07-27 09:36:13 -0700 + + * Fix a use-after-free during shutdown (Tim Wojtulewicz, Corelight) + 4.2.0-dev.48 | 2021-07-26 13:03:01 -0700 * GH-1693: Fix potential crash with elements being modified during robust iteration (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index d7725ec63f..d843d69b51 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.0-dev.48 +4.2.0-dev.50 diff --git a/src/RunState.cc b/src/RunState.cc index 12835b5515..6ab0542e10 100644 --- a/src/RunState.cc +++ b/src/RunState.cc @@ -422,8 +422,6 @@ void 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 ) delete zeek::detail::ip_anonymizer[i]; } diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index 2f7ca0d014..e168dfd00a 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -64,6 +64,7 @@ #include "zeek/iosource/Manager.h" #include "zeek/broker/Manager.h" #include "zeek/telemetry/Manager.h" +#include "zeek/session/Manager.h" #include "zeek/binpac_zeek.h" #include "zeek/module_util.h" @@ -334,6 +335,7 @@ static void terminate_bro() delete reporter; delete plugin_mgr; delete val_mgr; + delete session_mgr; delete fragment_mgr; delete telemetry_mgr;