GH-734: Improve handling of lambdas that escape enclosing frame

This commit is contained in:
Jon Siwek 2020-07-14 22:11:04 -07:00
parent fd8db24daf
commit eb826bd337
5 changed files with 62 additions and 0 deletions

View file

@ -128,6 +128,20 @@ const zeek::ValPtr& Frame::GetElementByID(const zeek::detail::ID* id) const
void Frame::Reset(int startIdx)
{
if ( functions_with_closure_frame_reference )
{
for ( auto& func : *functions_with_closure_frame_reference )
{
// A lambda could be escaping its enclosing Frame at this point so
// it needs to claim some ownership (or copy) of the Frame in
// order to be of any further use.
func->StrengthenClosureReference(this);
Unref(func);
}
functions_with_closure_frame_reference.reset();
}
for ( int i = startIdx; i < size; ++i )
ClearElement(i);
}