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

Fix copy() to work with a vector that has trailing holes

Browse source 
Previously, the trailing holes would not be preserved in the copy.
This commit is contained in:
Jon Siwek 2021-04-19 19:23:04 -07:00
parent d00748a2e7
commit 819fc1aac0
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Val.cc
View file

@ -3706,8 +3706,7 @@ ValPtr VectorVal::DoClone(CloneState* state)
for ( auto i = 0; i < n; ++i ) for ( auto i = 0; i < n; ++i )
{ {
auto elem = At(i); auto elem = At(i);
if ( elem ) vv->Assign(i, elem ? elem->Clone(state) : nullptr);
vv->Assign(i, elem->Clone(state));
} }
return vv; return vv;

1
testing/btest/Baseline/language.vector/out
View file

@ -75,3 +75,4 @@ slicing assignment grow (PASS)
slicing assignment shrink (PASS) slicing assignment shrink (PASS)
? operator (PASS) ? operator (PASS)
copy of a vector with holes (PASS) copy of a vector with holes (PASS)
copy of a vector with trailing holes, [0, 2, 3, 77, , ], [0, 2, 3, 77, , ]

5
testing/btest/language/vector.zeek
View file

@ -200,4 +200,9 @@ event zeek_init()
# Test copying of a vector with holes, as this used to crash. # Test copying of a vector with holes, as this used to crash.
local v19 = copy(v5); local v19 = copy(v5);
test_case( "copy of a vector with holes", |v5| == |v19| ); test_case( "copy of a vector with holes", |v5| == |v19| );
# Even after removing some elements at the end, any trailing holes should
# be preserved after copying;
v5[6:] = vector();
local v20 = copy(v5);
print "copy of a vector with trailing holes", v5, v20;
} }