Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/shutdown-use-after-free'

Browse source 
* origin/topic/timw/shutdown-use-after-free:
  Fix a use-after-free during shutdown
This commit is contained in:
Tim Wojtulewicz 2021-07-27 09:36:13 -07:00
commit 56ee21b97b
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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 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) * GH-1693: Fix potential crash with elements being modified during robust iteration (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.2.0-dev.48 4.2.0-dev.50

2
src/RunState.cc
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];
} }

2
src/zeek-setup.cc
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;