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

Fix memory leaks in expire_func introduced by recent changes

Browse source
This commit is contained in:
Jon Siwek 2019-07-29 18:07:35 -07:00
parent 1a7f14dab0
commit 01611177f7
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Val.cc
View file

@ -2318,23 +2318,28 @@ double TableVal::CallExpireFunc(Val* idx)
{
if ( ! any_idiom )
{
const val_list* vl0 = idx->AsListVal()->Vals();
for ( const auto& v : *idx->AsListVal()->Vals() )
vl.append(v->Ref());
Unref(idx);
}
else
{
ListVal* idx_list = idx->AsListVal();
// Flatten if only one element
if (idx_list->Length() == 1)
idx = idx_list->Index(0);
if ( idx_list->Length() == 1 )
{
Val* old = idx;
idx = idx_list->Index(0)->Ref();
Unref(old);
}
vl.append(idx->Ref());
vl.append(idx);
}
}
else
{
vl.append(idx->Ref());
vl.append(idx);
}
Val* result = 0;