tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6759 from Icinga/bugfix/streamlogger-delete 

Fix possible double free in StreamLogger::BindStream()
This commit is contained in:
Michael Friedrich 2018-11-09 11:50:38 +01:00 committed by GitHub
parent bd1cfc7bf9 1f5555e1d6
commit 9767ad14f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/streamlogger.cpp
View File

@ -47,7 +47,7 @@ StreamLogger::~StreamLogger()
if (m_FlushLogTimer)
m_FlushLogTimer->Stop();
if (m_OwnsStream)
if (m_Stream && m_OwnsStream)
delete m_Stream;
}
@ -66,7 +66,7 @@ void StreamLogger::BindStream(std::ostream *stream, bool ownsStream)
{
ObjectLock olock(this);
if (m_OwnsStream)
if (m_Stream && m_OwnsStream)
delete m_Stream;
m_Stream = stream;