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

Fix logging filter over-allocation and leak.

Browse source 
The leak could happen in a couple cases where adding a log filter
fails: OOM and unsupported field type.
This commit is contained in:
Jon Siwek 2013-09-04 14:25:57 -05:00
parent 0678468353
commit f9dc48e573
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/logging/Manager.cc
View file

@ -538,10 +538,11 @@ bool Manager::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt,
filter->fields = (threading::Field**) filter->fields = (threading::Field**)
realloc(filter->fields, realloc(filter->fields,
sizeof(threading::Field) * ++filter->num_fields); sizeof(threading::Field*) * ++filter->num_fields);
if ( ! filter->fields ) if ( ! filter->fields )
{ {
--filter->num_fields;
reporter->Error("out of memory in add_filter"); reporter->Error("out of memory in add_filter");
return false; return false;
} }
@ -623,7 +624,10 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval)
include ? include->AsTableVal() : 0, include ? include->AsTableVal() : 0,
exclude ? exclude->AsTableVal() : 0, exclude ? exclude->AsTableVal() : 0,
"", list<int>()) ) "", list<int>()) )
{
delete filter;
return false; return false;
}
// Get the path for the filter. // Get the path for the filter.
Val* path_val = fval->Lookup(rtype->FieldOffset("path")); Val* path_val = fval->Lookup(rtype->FieldOffset("path"));