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

Potential fix for #588.

Browse source
This commit is contained in:
Robin Sommer 2011-09-07 11:03:36 -07:00
parent eda2245e9e
commit f868af101c
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,4 +1,18 @@
1.6-dev-1198 | 2011-09-07 11:03:36 -0700
* Extended header for ASCII log that make it easier for scripts to
parse Bro log files. (Gilbert Clark)
* Potential fix for rotation crashes. Addresses #588. (Robin Sommer)
* Added PF_RING load balancing support to the scripting layer,
enabled by loading the misc/pf-ring-load-balancing script. (Seth
Hall)
* Added a BiF setenv() for setting environment variables. (Seth
Hall)
1.6-dev-1184 | 2011-09-04 09:34:50 -0700 1.6-dev-1184 | 2011-09-04 09:34:50 -0700
* FindPCAP now links against thread library when necessary (e.g. * FindPCAP now links against thread library when necessary (e.g.

2
VERSION
View file

@ -1 +1 @@
1.6-dev-1184 1.6-dev-1198

5
src/LogMgr.cc
View file

@ -444,7 +444,7 @@ LogMgr::WriterInfo* LogMgr::FindWriter(LogWriter* writer)
{ {
WriterInfo* winfo = i->second; WriterInfo* winfo = i->second;
if ( winfo->writer == writer ) if ( winfo && winfo->writer == writer )
return winfo; return winfo;
} }
} }
@ -1506,7 +1506,8 @@ bool LogMgr::FinishedRotation(LogWriter* writer, string new_name, string old_nam
writer->Path().c_str(), network_time, new_name.c_str()); writer->Path().c_str(), network_time, new_name.c_str());
WriterInfo* winfo = FindWriter(writer); WriterInfo* winfo = FindWriter(writer);
assert(winfo); if ( ! winfo )
return true;
RecordVal* rc = RecordVal* rc =
LookupRotationControl(winfo->type, winfo->writer->Path()); LookupRotationControl(winfo->type, winfo->writer->Path());