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

GH-1672: Keep a reference to a table being expired, just in case

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-05-16 15:33:54 -07:00
parent 8184073ef8
commit b8ca68f548
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Val.cc
View file

@ -1359,15 +1359,27 @@ TableValTimer::TableValTimer(TableVal* val, double t) : detail::Timer(t, detail:
TableValTimer::~TableValTimer()
{
table->ClearTimer(this);
if ( table )
table->ClearTimer(this);
}
void TableValTimer::Dispatch(double t, bool is_expire)
{
if ( ! is_expire )
{
// Take this reference in case the expiration does something silly like resetting the
// table object itself. Doing so would cause a crash since the method would try to
// delete the table while it was being actively used.
TableValPtr temp = {NewRef{}, table};
table->ClearTimer(this);
table->DoExpire(t);
// If the table did get deleted earlier, then the only existing reference will be the
// one taken above. In that case, set table to nullptr here so ~TableValTimer doesn't
// also try to do something with it.
if ( table->RefCnt() == 1 )
table = nullptr;
}
}