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

Small raw reader fixes

Browse source 
* crash when accessing nonexistant file.
* memory leak when reading from file.

Addresses #1038.
This commit is contained in:
Bernhard Amann 2013-07-15 13:50:40 -07:00
parent 58290d6fc0
commit 7427ce511b
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/input/readers/Raw.cc
View file

@ -55,6 +55,13 @@ void Raw::DoClose()
if ( file != 0 ) if ( file != 0 )
CloseInput(); CloseInput();
if ( buf != 0 )
{
// we still have output that has not been flushed. Throw away.
delete buf;
buf = 0;
}
if ( execute && childpid > 0 && kill(childpid, 0) == 0 ) if ( execute && childpid > 0 && kill(childpid, 0) == 0 )
{ {
// kill child process // kill child process
@ -157,13 +164,13 @@ bool Raw::OpenInput()
else else
{ {
file = fopen(fname.c_str(), "r"); file = fopen(fname.c_str(), "r");
fcntl(fileno(file), F_SETFD, FD_CLOEXEC);
if ( ! file ) if ( ! file )
{ {
Error(Fmt("Init: cannot open %s", fname.c_str())); Error(Fmt("Init: cannot open %s", fname.c_str()));
return false; return false;
} }
} }
fcntl(fileno(file), F_SETFD, FD_CLOEXEC);
return true; return true;
} }
@ -322,13 +329,15 @@ int64_t Raw::GetLine(FILE* arg_file)
// but first check if we encountered the file end - because if we did this was it. // but first check if we encountered the file end - because if we did this was it.
if ( feof(arg_file) != 0 ) if ( feof(arg_file) != 0 )
{ {
outbuf = buf;
buf = 0;
if ( pos == 0 ) if ( pos == 0 )
return -1; // signal EOF - and that we had no more data. return -1; // signal EOF - and that we had no more data.
else else
{
outbuf = buf;
buf = 0;
return pos; return pos;
} }
}
repeats++; repeats++;
// bah, we cannot use realloc because we would have to change the delete in the manager to a free. // bah, we cannot use realloc because we would have to change the delete in the manager to a free.
@ -342,8 +351,6 @@ int64_t Raw::GetLine(FILE* arg_file)
{ {
outbuf = buf; outbuf = buf;
buf = 0; buf = 0;
buf = new char[block_size];
if ( found < pos ) if ( found < pos )
{ {
@ -368,7 +375,7 @@ int64_t Raw::GetLine(FILE* arg_file)
return -3; return -3;
} }
InternalError("Internal control flow execution"); InternalError("Internal control flow execution error in raw reader");
assert(false); assert(false);
} }