From cea9194650e96c51b612a4dbdfe01a7f5e0c787e Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 26 Jul 2021 14:26:22 -0700
Subject: [PATCH] Fix a use-after-free during shutdown

---
 src/RunState.cc   | 2 --
 src/zeek-setup.cc | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

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;