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

Merge remote-tracking branch 'origin/topic/vern/CPP-Apr23-maint'

Browse source 
* origin/topic/vern/CPP-Apr23-maint:
  addressed static analysis concern about possible null pointer
  tweaks for "-O C++" of BTest's with conditional code

Backed out changes from at-if-lambda during merge and instead skip
test when running with ZEEK_USE_CPP.
This commit is contained in:
Arne Welzel 2023-04-03 16:37:02 +02:00
commit 1858c6b0c2
6 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
6.0.0-dev.303 | 2023-04-03 16:37:02 +0200
* addressed static analysis concern about possible null pointer (Vern Paxson, Corelight)
* tweaks for "-O C++" of BTest's with conditional code (Vern Paxson, Corelight)
6.0.0-dev.300 | 2023-04-03 13:32:40 +0200 6.0.0-dev.300 | 2023-04-03 13:32:40 +0200
* minor ZAM BTest baseline updates (Vern Paxson, Corelight) * minor ZAM BTest baseline updates (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.300 6.0.0-dev.303

1
src/script_opt/CPP/InitsInfo.cc
View file

@ -329,6 +329,7 @@ AttrInfo::AttrInfo(CPPCompile* _c, const AttrPtr& attr) : CompoundItemInfo(_c)
else else
{ {
ASSERT(a_e->Tag() == EXPR_RECORD_COERCE); ASSERT(a_e->Tag() == EXPR_RECORD_COERCE);
ASSERT(gi);
vals.emplace_back(Fmt(static_cast<int>(AE_RECORD))); vals.emplace_back(Fmt(static_cast<int>(AE_RECORD)));
vals.emplace_back(Fmt(gi->Offset())); vals.emplace_back(Fmt(gi->Offset()));
} }

1
testing/btest/language/at-if-lambda.zeek
View file

@ -1,4 +1,5 @@
# @TEST-DOC: Regression test for #2075 from 0xxon # @TEST-DOC: Regression test for #2075 from 0xxon
# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
# @TEST-EXEC: zeek -b %INPUT # @TEST-EXEC: zeek -b %INPUT
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stderr # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff .stderr

2
testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
View file

@ -9,10 +9,8 @@ event analyzer_violation(c: connection, atype: AllAnalyzers::Tag, aid: count, re
print "analyzer_violation", c$id, atype, aid, reason; print "analyzer_violation", c$id, atype, aid, reason;
} }
@if ( Version::at_least("5.1") )
event analyzer_violation_info(tag: AllAnalyzers::Tag, info: AnalyzerViolationInfo) event analyzer_violation_info(tag: AllAnalyzers::Tag, info: AnalyzerViolationInfo)
{ {
print "reason", info$reason; print "reason", info$reason;
print "data", fmt("%s", info$data); print "data", fmt("%s", info$data);
} }
@endif

1
testing/btest/supervisor/config-cluster-pcap.zeek
View file

@ -1,4 +1,5 @@
# @TEST-DOC: Test support for pcap_file on Supervisor::ClusterEndpoint and Supervisor::NodeConfig # @TEST-DOC: Test support for pcap_file on Supervisor::ClusterEndpoint and Supervisor::NodeConfig
# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
# #
# @TEST-PORT: MANAGER_PORT # @TEST-PORT: MANAGER_PORT
# @TEST-PORT: WORKER_PORT # @TEST-PORT: WORKER_PORT