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

Fix reference counting in ListExpr inline/reduce methods

Browse source
This commit is contained in:
Jon Siwek 2021-01-13 23:01:44 -08:00
parent fffeea472a
commit 7ce4351ed0
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/script_opt/Expr.cc
View file

@ -2243,7 +2243,11 @@ ExprPtr ListExpr::Duplicate()
ExprPtr ListExpr::Inline(Inliner* inl) ExprPtr ListExpr::Inline(Inliner* inl)
{ {
loop_over_list(exprs, i) loop_over_list(exprs, i)
exprs[i] = exprs[i]->Inline(inl).release(); {
auto in_expr = exprs[i]->Inline(inl);
Unref(exprs[i]);
exprs[i] = in_expr.release();
}
return ThisPtr(); return ThisPtr();
} }
@ -2286,7 +2290,8 @@ ExprPtr ListExpr::Reduce(Reducer* c, StmtPtr& red_stmt)
if ( c->Optimizing() ) if ( c->Optimizing() )
{ {
auto e_i = c->UpdateExpr(exprs[i]->ThisPtr()); auto e_i = c->UpdateExpr(exprs[i]->ThisPtr());
exprs.replace(i, e_i.release()); auto old = exprs.replace(i, e_i.release());
Unref(old);
continue; continue;
} }
@ -2294,8 +2299,9 @@ ExprPtr ListExpr::Reduce(Reducer* c, StmtPtr& red_stmt)
continue; continue;
StmtPtr e_stmt; StmtPtr e_stmt;
exprs.replace(i, auto old = exprs.replace(i,
exprs[i]->ReduceToSingleton(c, e_stmt).release()); exprs[i]->ReduceToSingleton(c, e_stmt).release());
Unref(old);
if ( e_stmt ) if ( e_stmt )
red_stmt = MergeStmts(red_stmt, e_stmt); red_stmt = MergeStmts(red_stmt, e_stmt);
@ -2314,7 +2320,8 @@ StmtPtr ListExpr::ReduceToSingletons(Reducer* c)
continue; continue;
StmtPtr e_stmt; StmtPtr e_stmt;
exprs.replace(i, exprs[i]->Reduce(c, e_stmt).release()); auto old = exprs.replace(i, exprs[i]->Reduce(c, e_stmt).release());
Unref(old);
if ( e_stmt ) if ( e_stmt )
red_stmt = MergeStmts(red_stmt, e_stmt); red_stmt = MergeStmts(red_stmt, e_stmt);