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

Expr: fix various memory leaks in Assign()

Browse source
This commit is contained in:
Max Kellermann 2020-02-19 11:15:16 +01:00
parent 593ebc1d62
commit 6ce1081b38
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Expr.cc
View file

@ -101,8 +101,9 @@ void Expr::EvalIntoAggregate(const BroType* /* t */, Val* /* aggr */,
Internal("Expr::EvalIntoAggregate called"); Internal("Expr::EvalIntoAggregate called");
} }
void Expr::Assign(Frame* /* f */, Val* /* v */) void Expr::Assign(Frame* /* f */, Val* v)
{ {
Unref(v);
Internal("Expr::Assign called"); Internal("Expr::Assign called");
} }
@ -2787,11 +2788,17 @@ Val* IndexExpr::Fold(Val* v1, Val* v2) const
void IndexExpr::Assign(Frame* f, Val* v) void IndexExpr::Assign(Frame* f, Val* v)
{ {
if ( IsError() ) if ( IsError() )
{
Unref(v);
return; return;
}
Val* v1 = op1->Eval(f); Val* v1 = op1->Eval(f);
if ( ! v1 ) if ( ! v1 )
{
Unref(v);
return; return;
}
Val* v2 = op2->Eval(f); Val* v2 = op2->Eval(f);
@ -2799,6 +2806,7 @@ void IndexExpr::Assign(Frame* f, Val* v)
{ {
Unref(v1); Unref(v1);
Unref(v2); Unref(v2);
Unref(v);
return; return;
} }
@ -2873,6 +2881,7 @@ void IndexExpr::Assign(Frame* f, Val* v)
Unref(v1); Unref(v1);
Unref(v2); Unref(v2);
Unref(v);
} }
void IndexExpr::ExprDescribe(ODesc* d) const void IndexExpr::ExprDescribe(ODesc* d) const
@ -2949,7 +2958,10 @@ int FieldExpr::CanDel() const
void FieldExpr::Assign(Frame* f, Val* v) void FieldExpr::Assign(Frame* f, Val* v)
{ {
if ( IsError() ) if ( IsError() )
{
Unref(v);
return; return;
}
Val* op_v = op->Eval(f); Val* op_v = op->Eval(f);
if ( op_v ) if ( op_v )
@ -2958,6 +2970,8 @@ void FieldExpr::Assign(Frame* f, Val* v)
r->Assign(field, v); r->Assign(field, v);
Unref(r); Unref(r);
} }
else
Unref(v);
} }
void FieldExpr::Delete(Frame* f) void FieldExpr::Delete(Frame* f)
@ -4889,6 +4903,7 @@ void ListExpr::Assign(Frame* f, Val* v)
exprs[i]->Assign(f, (*lv->Vals())[i]->Ref()); exprs[i]->Assign(f, (*lv->Vals())[i]->Ref());
Unref(lv); Unref(lv);
Unref(v);
} }
TraversalCode ListExpr::Traverse(TraversalCallback* cb) const TraversalCode ListExpr::Traverse(TraversalCallback* cb) const