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

GH-839: Fix use of &optional sub-records within table/set indices

Browse source
This commit is contained in:
Jon Siwek 2021-05-26 13:28:13 -07:00
parent 5f57daf9d1
commit 77f1ede661
3 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CompHash.cc
View file

@ -509,6 +509,9 @@ int CompositeHash::SingleTypeKeySize(Type* bt, const Val* v,
case TYPE_RECORD:
{
if ( ! v )
return (optional && ! calc_static_size) ? sz : 0;
const RecordVal* rv = v ? v->AsRecordVal() : nullptr;
RecordType* rt = bt->AsRecordType();
int num_fields = rt->NumFields();

18
testing/btest/Baseline/language.table-optional-subrecord-index/out Normal file
View file

@ -0,0 +1,18 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
2, {
[subrec=[str=hi]],
[subrec=<uninitialized>]
}
T
T
T
T
T
0, {
}
T
T
T
T
T

35
testing/btest/language/table-optional-subrecord-index.zeek Normal file
View file

@ -0,0 +1,35 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-DOC: Check functionality of a table/set index consisting of optional sub-records.
type SubRec: record {
str: string;
};
type Rec: record {
subrec: SubRec &optional;
};
global myset: set[Rec] = set();
local i = Rec();
local j = Rec($subrec=SubRec($str="hi"));
add myset[i];
add myset[j];
print |myset|, myset;
# All membership tests below are expected to evaluate to true.
print i in myset;
print j in myset;
print Rec() in myset;
print Rec($subrec=SubRec($str="hi")) in myset;
print Rec($subrec=SubRec($str="no")) !in myset;
delete myset[i];
delete myset[j];
print |myset|, myset;
print i !in myset;
print j !in myset;
print Rec() !in myset;
print Rec($subrec=SubRec($str="hi")) !in myset;
print Rec($subrec=SubRec($str="no")) !in myset;