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

Fix double close() in FilerSerializer class.

Browse source
This commit is contained in:
Jon Siwek 2012-07-25 18:05:42 -05:00
parent c3aba199f6
commit c48a16664b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Serializer.cc
View file

@ -742,9 +742,10 @@ FileSerializer::~FileSerializer()
io->Flush(); io->Flush();
delete [] file; delete [] file;
delete io;
if ( fd >= 0 ) if ( io )
delete io; // destructor will call close() on fd
else if ( fd >= 0 )
close(fd); close(fd);
} }
@ -808,7 +809,7 @@ void FileSerializer::CloseFile()
if ( io ) if ( io )
io->Flush(); io->Flush();
if ( fd >= 0 ) if ( fd >= 0 && ! io ) // destructor of io calls close() on fd
close(fd); close(fd);
fd = -1; fd = -1;