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

fix small memory leak (field description given to readers was never freed).

Browse source
This commit is contained in:
Bernhard Amann 2012-03-22 15:11:42 -07:00
parent 6c4a40f176
commit f73de0bc8c
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/input/ReaderBackend.cc
View file

@ -169,6 +169,9 @@ bool ReaderBackend::Init(string arg_source, int mode, const int arg_num_fields,
source = arg_source; source = arg_source;
SetName("InputReader/"+source); SetName("InputReader/"+source);
num_fields = arg_num_fields;
fields = arg_fields;
// disable if DoInit returns error. // disable if DoInit returns error.
int success = DoInit(arg_source, mode, arg_num_fields, arg_fields); int success = DoInit(arg_source, mode, arg_num_fields, arg_fields);
@ -188,6 +191,16 @@ void ReaderBackend::Finish()
disabled = true; disabled = true;
DisableFrontend(); DisableFrontend();
SendOut(new ReaderFinishedMessage(frontend)); SendOut(new ReaderFinishedMessage(frontend));
if ( fields != 0 ) {
for ( unsigned int i = 0; i < num_fields; i++ ) {
delete(fields[i]);
}
delete[] (fields);
fields = 0;
}
} }
bool ReaderBackend::Update() bool ReaderBackend::Update()

3
src/input/ReaderBackend.h
View file

@ -228,6 +228,9 @@ private:
char* buf; char* buf;
unsigned int buf_len; unsigned int buf_len;
bool autostart; bool autostart;
unsigned int num_fields;
const threading::Field* const * fields; // raw mapping
}; };
} }

1
src/input/readers/Ascii.cc
View file

@ -73,7 +73,6 @@ Ascii::Ascii(ReaderFrontend *frontend) : ReaderBackend(frontend)
Ascii::~Ascii() Ascii::~Ascii()
{ {
DoFinish(); DoFinish();
} }
void Ascii::DoFinish() void Ascii::DoFinish()