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

Val: pass IntrusivePtr<> to TableVal::ExpandAndInit()

Browse source 
Clarifies ownership and fixes memory leaks.

Closes https://github.com/zeek/zeek/issues/811
This commit is contained in:
Max Kellermann 2020-02-22 11:01:59 +01:00
parent 48fba11c51
commit e2bf12d54a
3 changed files with 23 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Expr.cc
View file

@ -2477,19 +2477,17 @@ Val* AssignExpr::InitVal(const BroType* t, Val* aggr) const
TableVal* tv = aggr->AsTableVal();
const TableType* tt = tv->Type()->AsTableType();
const BroType* yt = tv->Type()->YieldType();
Val* index = op1->InitVal(tt->Indices(), 0);
Val* v = op2->InitVal(yt, 0);
IntrusivePtr<Val> index{AdoptRef{}, op1->InitVal(tt->Indices(), 0)};
IntrusivePtr<Val> v{AdoptRef{}, op2->InitVal(yt, 0)};
if ( ! index || ! v )
return 0;
if ( ! tv->ExpandAndInit(index, v) )
if ( ! tv->ExpandAndInit(std::move(index), std::move(v)) )
{
Unref(index);
Unref(tv);
return 0;
}
Unref(index);
return tv;
}
@ -4899,14 +4897,12 @@ Val* ListExpr::AddSetInit(const BroType* t, Val* aggr) const
if ( ! element )
return 0;
if ( ! tv->ExpandAndInit(element, 0) )
if ( ! tv->ExpandAndInit({AdoptRef{}, element}, 0) )
{
Unref(element);
Unref(tv);
return 0;
}
Unref(element);
}
return tv;