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

Fix use-after-move of proc_status_file breaking -U flag

Browse source
This commit is contained in:
Jon Siwek 2020-06-04 15:11:56 -07:00
parent 88654fa989
commit ef6bd3ee39
5 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,3 +1,10 @@
3.2.0-dev.744 | 2020-06-04 15:11:56 -0700
* Fix use-after-move of proc_status_file breaking -U flag (Jon Siwek, Corelight)
* Change Cirrus CI config to use org-level secured variable (Jon Siwek, Corelight)
3.2.0-dev.742 | 2020-06-03 13:29:12 -0700
* GH-973: Fix the return type of topk_get_top()

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.742
3.2.0-dev.744

2
src/zeek-setup.cc
View file

@ -457,7 +457,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
}
if ( options.process_status_file )
proc_status_file = options.process_status_file->data();
proc_status_file = copy_string(options.process_status_file->data());
atexit(atexit_handler);
set_processing_status("INITIALIZING", "main");

1
testing/btest/Baseline/core.proc-status-file/status-file Executable file
View file

@ -0,0 +1 @@
TERMINATED [atexit]

2
testing/btest/core/proc-status-file.zeek Normal file
View file

@ -0,0 +1,2 @@
# @TEST-EXEC: zeek -b -U status-file -e ''
# @TEST-EXEC: btest-diff status-file