From 80469a1fde28ba4413843c43fb9a88c38e651a3c Mon Sep 17 00:00:00 2001 From: Justin Azoff Date: Wed, 8 Jan 2020 11:40:28 -0500 Subject: [PATCH 01/10] fix NTLM field value access The fields being checked for existence were not the same as the fields being accessed. --- scripts/base/protocols/ntlm/main.zeek | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/base/protocols/ntlm/main.zeek b/scripts/base/protocols/ntlm/main.zeek index fb10a9868f..81bfa633dd 100644 --- a/scripts/base/protocols/ntlm/main.zeek +++ b/scripts/base/protocols/ntlm/main.zeek @@ -65,9 +65,9 @@ event ntlm_challenge(c: connection, challenge: NTLM::Challenge) &priority=5 if ( challenge?$target_info ) { local ti = challenge$target_info; - if ( ti?$nb_domain_name ) + if ( ti?$nb_computer_name ) c$ntlm$server_nb_computer_name = ti$nb_computer_name; - if ( ti?$dns_domain_name ) + if ( ti?$dns_computer_name ) c$ntlm$server_dns_computer_name = ti$dns_computer_name; if ( ti?$dns_tree_name ) c$ntlm$server_tree_name = ti$dns_tree_name; From 1f3ec434a883997162d32040ae1d2f16043f4387 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 8 Jan 2020 21:04:18 -0800 Subject: [PATCH 02/10] Extend ASAN_OPTIONS in btests instead of overwrite --- testing/btest/core/div-by-zero.zeek | 2 +- testing/btest/core/expr-exception.zeek | 2 +- testing/btest/core/reporter-error-in-handler.zeek | 2 +- testing/btest/core/when-interpreter-exceptions.zeek | 2 +- testing/btest/language/common-mistakes.zeek | 6 +++--- testing/btest/language/copy-cycle.zeek | 2 +- testing/btest/language/expire-expr-error.zeek | 2 +- testing/btest/language/expire-func-undef.zeek | 2 +- testing/btest/language/index-assignment-invalid.zeek | 2 +- testing/btest/language/invalid_index.zeek | 2 +- testing/btest/language/subnet-errors.zeek | 2 +- testing/btest/language/type-cast-error-dynamic.zeek | 2 +- testing/btest/language/type-coerce-numerics.zeek | 2 +- testing/btest/language/uninitialized-local2.zeek | 2 +- testing/btest/plugins/reporter-hook.zeek | 2 +- .../scripts/base/frameworks/reporter/disable-stderr.zeek | 2 +- testing/btest/scripts/base/frameworks/reporter/stderr.zeek | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/testing/btest/core/div-by-zero.zeek b/testing/btest/core/div-by-zero.zeek index 1d0f7013ca..56feb278d6 100644 --- a/testing/btest/core/div-by-zero.zeek +++ b/testing/btest/core/div-by-zero.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out event div_int(a: int, b: int) diff --git a/testing/btest/core/expr-exception.zeek b/testing/btest/core/expr-exception.zeek index 4cbb4b1c47..27fcbad5a2 100644 --- a/testing/btest/core/expr-exception.zeek +++ b/testing/btest/core/expr-exception.zeek @@ -2,7 +2,7 @@ # shouldn't abort Zeek entirely, but just return from the function body. # # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -r $TRACES/wikipedia.trace %INPUT >output +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -r $TRACES/wikipedia.trace %INPUT >output # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log # @TEST-EXEC: btest-diff output diff --git a/testing/btest/core/reporter-error-in-handler.zeek b/testing/btest/core/reporter-error-in-handler.zeek index 1b13c0ddbe..3ec9eac280 100644 --- a/testing/btest/core/reporter-error-in-handler.zeek +++ b/testing/btest/core/reporter-error-in-handler.zeek @@ -3,7 +3,7 @@ # than looping indefinitly, the error inside the handler should reported to stderr. # # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek %INPUT >output 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek %INPUT >output 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output global a: table[count] of count; diff --git a/testing/btest/core/when-interpreter-exceptions.zeek b/testing/btest/core/when-interpreter-exceptions.zeek index f70bb39ea4..fb6c0d1f3b 100644 --- a/testing/btest/core/when-interpreter-exceptions.zeek +++ b/testing/btest/core/when-interpreter-exceptions.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" btest-bg-run zeek "zeek -b %INPUT >output 2>&1" +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" btest-bg-run zeek "zeek -b %INPUT >output 2>&1" # @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps | $SCRIPTS/diff-sort" btest-diff zeek/output diff --git a/testing/btest/language/common-mistakes.zeek b/testing/btest/language/common-mistakes.zeek index 6b8701b877..694dbe3ad2 100644 --- a/testing/btest/language/common-mistakes.zeek +++ b/testing/btest/language/common-mistakes.zeek @@ -3,13 +3,13 @@ # of the current event handler body. # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b 1.zeek >1.out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b 1.zeek >1.out 2>&1 # @TEST-EXEC: btest-diff 1.out -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b 2.zeek >2.out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b 2.zeek >2.out 2>&1 # @TEST-EXEC: btest-diff 2.out -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b 3.zeek >3.out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b 3.zeek >3.out 2>&1 # @TEST-EXEC: btest-diff 3.out @TEST-START-FILE 1.zeek diff --git a/testing/btest/language/copy-cycle.zeek b/testing/btest/language/copy-cycle.zeek index edda97547c..04dc5c3883 100644 --- a/testing/btest/language/copy-cycle.zeek +++ b/testing/btest/language/copy-cycle.zeek @@ -1,6 +1,6 @@ # TODO: There's explicitly a reference cycle being created in this test that # causes a memory leak, so just disable leak checking. -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >out +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >out # @TEST-EXEC: btest-diff out type B: record { diff --git a/testing/btest/language/expire-expr-error.zeek b/testing/btest/language/expire-expr-error.zeek index 907d5b8460..ac47d37d41 100644 --- a/testing/btest/language/expire-expr-error.zeek +++ b/testing/btest/language/expire-expr-error.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT # @TEST-EXEC: cp .stderr output # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output diff --git a/testing/btest/language/expire-func-undef.zeek b/testing/btest/language/expire-func-undef.zeek index dba8f6c873..9828fc886c 100644 --- a/testing/btest/language/expire-func-undef.zeek +++ b/testing/btest/language/expire-func-undef.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -r $TRACES/rotation.trace -b %INPUT >output 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -r $TRACES/rotation.trace -b %INPUT >output 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output module segfault; diff --git a/testing/btest/language/index-assignment-invalid.zeek b/testing/btest/language/index-assignment-invalid.zeek index ad7bc38384..947168f64c 100644 --- a/testing/btest/language/index-assignment-invalid.zeek +++ b/testing/btest/language/index-assignment-invalid.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >output 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >output 2>&1 # @TEST-EXEC: grep "error" output >output2 # @TEST-EXEC: for i in 1 2 3 4 5; do cat output2 | cut -d'|' -f$i >>out; done # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out diff --git a/testing/btest/language/invalid_index.zeek b/testing/btest/language/invalid_index.zeek index e55d691520..a1cbe4c868 100644 --- a/testing/btest/language/invalid_index.zeek +++ b/testing/btest/language/invalid_index.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out global foo: vector of count = { 42 }; diff --git a/testing/btest/language/subnet-errors.zeek b/testing/btest/language/subnet-errors.zeek index 4968e381ec..d0c9fd6aa4 100644 --- a/testing/btest/language/subnet-errors.zeek +++ b/testing/btest/language/subnet-errors.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out event zeek_init() diff --git a/testing/btest/language/type-cast-error-dynamic.zeek b/testing/btest/language/type-cast-error-dynamic.zeek index 3ae4cfcb6b..443cd1acc8 100644 --- a/testing/btest/language/type-cast-error-dynamic.zeek +++ b/testing/btest/language/type-cast-error-dynamic.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >output 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >output 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output type X: record { diff --git a/testing/btest/language/type-coerce-numerics.zeek b/testing/btest/language/type-coerce-numerics.zeek index 3e7c919f16..2c1a2eb241 100644 --- a/testing/btest/language/type-coerce-numerics.zeek +++ b/testing/btest/language/type-coerce-numerics.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b first_set.zeek >first_set.out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b first_set.zeek >first_set.out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff first_set.out # @TEST-EXEC-FAIL: zeek -b double_convert_failure1.zeek >double_convert_failure1.out 2>&1 diff --git a/testing/btest/language/uninitialized-local2.zeek b/testing/btest/language/uninitialized-local2.zeek index 8d270cc041..d5f8eb7cec 100644 --- a/testing/btest/language/uninitialized-local2.zeek +++ b/testing/btest/language/uninitialized-local2.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek -b %INPUT >out 2>&1 +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out event test() diff --git a/testing/btest/plugins/reporter-hook.zeek b/testing/btest/plugins/reporter-hook.zeek index 7d1f2b1093..6619d98224 100644 --- a/testing/btest/plugins/reporter-hook.zeek +++ b/testing/btest/plugins/reporter-hook.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: cp -r %DIR/reporter-hook-plugin/* . # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq >output +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log diff --git a/testing/btest/scripts/base/frameworks/reporter/disable-stderr.zeek b/testing/btest/scripts/base/frameworks/reporter/disable-stderr.zeek index 0f1b48bab7..803308dbb6 100644 --- a/testing/btest/scripts/base/frameworks/reporter/disable-stderr.zeek +++ b/testing/btest/scripts/base/frameworks/reporter/disable-stderr.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek %INPUT +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log diff --git a/testing/btest/scripts/base/frameworks/reporter/stderr.zeek b/testing/btest/scripts/base/frameworks/reporter/stderr.zeek index bfbecc206f..c1af87d9ad 100644 --- a/testing/btest/scripts/base/frameworks/reporter/stderr.zeek +++ b/testing/btest/scripts/base/frameworks/reporter/stderr.zeek @@ -1,5 +1,5 @@ # TODO: interpreter exceptions currently may cause memory leaks, so disable leak checks -# @TEST-EXEC: ASAN_OPTIONS="detect_leaks=0" zeek %INPUT +# @TEST-EXEC: ASAN_OPTIONS="$ASAN_OPTIONS,detect_leaks=0" zeek %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log From a4089bc6595125b745bdfda6defcd0af5aafe61c Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 8 Jan 2020 21:14:40 -0800 Subject: [PATCH 03/10] Enable LeakSanitizer for unit tests run via doctest --- src/main.cc | 1 + src/util.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main.cc b/src/main.cc index a3e7f37e9d..45dbbec983 100644 --- a/src/main.cc +++ b/src/main.cc @@ -454,6 +454,7 @@ int main(int argc, char** argv) #else doctest::Context context; context.applyCommandLine(std::distance(first, separator), argv); + ZEEK_LSAN_ENABLE(); return context.run(); #endif } diff --git a/src/util.cc b/src/util.cc index 9a5e2d9355..2b46e38f7b 100644 --- a/src/util.cc +++ b/src/util.cc @@ -167,6 +167,7 @@ TEST_CASE("util get_escaped_string") { ODesc* d = get_escaped_string(nullptr, "a bcd\n", 6, false); CHECK(strcmp(d->Description(), "a\\x20bcd\\x0a") == 0); + delete d; } SUBCASE("provided ODesc") From da0185a60ff1ce282c4d9ee9ec6470e879d34e9a Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 9 Jan 2020 12:28:32 -0800 Subject: [PATCH 04/10] Update external test repo commit hash --- CHANGES | 4 ++++ VERSION | 2 +- testing/external/commit-hash.zeek-testing-private | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index bd2b871ea7..29b8db49a1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.366 | 2020-01-09 12:28:32 -0800 + + * Update external test repo commit hash (Jon Siwek, Corelight) + 3.1.0-dev.365 | 2020-01-09 11:38:06 -0800 * Enable LeakSanitizer for unit tests run via doctest (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index ee9e604418..2d8cf564b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.365 +3.1.0-dev.366 diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private index 4c0cb92860..edb5b9badb 100644 --- a/testing/external/commit-hash.zeek-testing-private +++ b/testing/external/commit-hash.zeek-testing-private @@ -1 +1 @@ -931f49917a86a260c69e091c2f66b693e74b33bf +f6b4374ade1603e0731488bea5fe9d8087c6288f From b34d7a84438237ab0fe94f6de3565b7ae9fa6ed3 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 9 Jan 2020 19:04:41 -0800 Subject: [PATCH 05/10] Update doc submodule --- doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc b/doc index 3bd1c12b9e..7192dbedf3 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 3bd1c12b9e2810b2cbe5e05629ddc59dd83d9d36 +Subproject commit 7192dbedf3ca9ce49294057262074f0e888177f3 From 6218f99b965cac3b345a104479666fa5380c2b84 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 9 Jan 2020 19:04:59 -0800 Subject: [PATCH 06/10] Update timeouts for a btest --- CHANGES | 4 ++++ VERSION | 2 +- .../base/frameworks/input/missing-file-initially.zeek | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index b07a1c2823..bf08a3a9b2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.370 | 2020-01-09 19:04:59 -0800 + + * Update timeouts for a btest (Jon Siwek, Corelight) + 3.1.0-dev.368 | 2020-01-09 13:39:38 -0800 * Extend ASAN_OPTIONS in btests instead of overwrite (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 0842d5090a..29b3715f3a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.368 +3.1.0-dev.370 diff --git a/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek index 5d87c6d786..d4898ef60f 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek +++ b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek @@ -4,12 +4,12 @@ # failing behavior. # @TEST-EXEC: btest-bg-run zeek zeek %INPUT -# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/init 5 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/init 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: mv does-exist.dat does-not-exist.dat -# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next 5 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: mv does-not-exist.dat does-not-exist-again.dat # @TEST-EXEC: echo "3 streaming still works" >> does-not-exist-again.dat -# @TEST-EXEC: btest-bg-wait 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stderr From ae9e79969e9d2a9de659dbc1fc81a2c94c67f54c Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Mon, 13 Jan 2020 11:24:20 +0000 Subject: [PATCH 07/10] Fix method returning a reference to a temporary. Found by cppcheck, via by Arthur Wong. --- src/plugin/ComponentManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugin/ComponentManager.h b/src/plugin/ComponentManager.h index 7ff9093dc8..88d04bb3f9 100644 --- a/src/plugin/ComponentManager.h +++ b/src/plugin/ComponentManager.h @@ -139,7 +139,7 @@ ComponentManager::ComponentManager(const string& arg_module, const string& template const std::string& ComponentManager::GetModule() const { - return module.c_str(); + return module; } template From bcf9dbac94a57068bdc93596d259a6d207885a92 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Mon, 13 Jan 2020 12:10:42 +0000 Subject: [PATCH 08/10] Update submodules. --- CHANGES | 5 +++++ VERSION | 2 +- aux/paraglob | 2 +- aux/zeekctl | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index bf08a3a9b2..6273a52362 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ +3.1.0-dev.372 | 2020-01-13 12:10:42 +0000 + + * Fix method returning a reference to a temporary. Found by + cppcheck, via by Arthur Wong. (Robin Sommer, Corelight) + 3.1.0-dev.370 | 2020-01-09 19:04:59 -0800 * Update timeouts for a btest (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 29b3715f3a..366ac4a582 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.370 +3.1.0-dev.372 diff --git a/aux/paraglob b/aux/paraglob index ee7932525f..ad61dd7f40 160000 --- a/aux/paraglob +++ b/aux/paraglob @@ -1 +1 @@ -Subproject commit ee7932525ff198f1270b3d941f449da5f939f29c +Subproject commit ad61dd7f402a831c299f688f20ba23f50b1b5c8e diff --git a/aux/zeekctl b/aux/zeekctl index 17f3b239f5..7cd8c600c3 160000 --- a/aux/zeekctl +++ b/aux/zeekctl @@ -1 +1 @@ -Subproject commit 17f3b239f5551d8a9050a8d26a254e516db5c393 +Subproject commit 7cd8c600c3623283bca0efdd01bb8229c2808aba From 6cb73e505b5a0c8139eb579300bb44e15b6fe67f Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 13 Jan 2020 09:32:15 -0800 Subject: [PATCH 09/10] Updating submodule(s). [nomail] --- aux/zeekctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aux/zeekctl b/aux/zeekctl index 7cd8c600c3..d2fe9b8b28 160000 --- a/aux/zeekctl +++ b/aux/zeekctl @@ -1 +1 @@ -Subproject commit 7cd8c600c3623283bca0efdd01bb8229c2808aba +Subproject commit d2fe9b8b28a786f2ca67f578da8d7310344faf6f From 9c353f56f126c622b0fa71f08ec41dbd2a6168bc Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 13 Jan 2020 10:08:21 -0800 Subject: [PATCH 10/10] Updating submodule(s). [nomail] --- aux/zeekctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aux/zeekctl b/aux/zeekctl index d2fe9b8b28..6933b86e60 160000 --- a/aux/zeekctl +++ b/aux/zeekctl @@ -1 +1 @@ -Subproject commit d2fe9b8b28a786f2ca67f578da8d7310344faf6f +Subproject commit 6933b86e60f22f7a39ac1a8adbee4867902ce02e