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

Fix mmdb pointer destruction

Browse source 
The mmdb references needs to use reset() instead of release()
so that the destructor gets called and the stale DB is actually
cleaned up. Otherwise, the pointer is leaked and the stale DB
remains in memory.
This commit is contained in:
peter.cullen 2023-10-19 12:52:49 -04:00 • committed by Arne Welzel
parent d3eaf587e7
commit c391bdba5d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/zeek.bif
View file

@ -4011,7 +4011,7 @@ static void report_mmdb_msg(const char* format, ...)
va_list al;
va_start(al, format);
std::string msg = zeek::util::fmt(format, al);
std::string msg = zeek::util::vfmt(format, al);
va_end(al);
zeek::reporter->Info("%s", msg.data());
@ -4159,7 +4159,7 @@ static void mmdb_check_loc()
{
report_mmdb_msg("Closing stale MaxMind DB [%s]", mmdb_loc->Filename());
did_mmdb_loc_db_error = false;
mmdb_loc.release();
mmdb_loc.reset();
}
}
@ -4169,7 +4169,7 @@ static void mmdb_check_asn()
{
report_mmdb_msg("Closing stale MaxMind DB [%s]", mmdb_asn->Filename());
did_mmdb_asn_db_error = false;
mmdb_asn.release();
mmdb_asn.reset();
}
}