tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in the StdioStream class.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-04-19 14:59:38 +02:00
parent fe4fd67405
commit d86767e8e3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/stdiostream.cpp
View File

@ -34,6 +34,11 @@ StdioStream::StdioStream(std::iostream *innerStream, bool ownsStream)
: m_InnerStream(innerStream), m_OwnsStream(ownsStream) : m_InnerStream(innerStream), m_OwnsStream(ownsStream)
{ } { }
StdioStream::~StdioStream(void)
{
Close();
}
size_t StdioStream::Read(void *buffer, size_t size) size_t StdioStream::Read(void *buffer, size_t size)
{ {
ObjectLock olock(this); ObjectLock olock(this);
@ -51,6 +56,8 @@ void StdioStream::Write(const void *buffer, size_t size)
void StdioStream::Close(void) void StdioStream::Close(void)
{ {
if (m_OwnsStream) if (m_OwnsStream) {
delete m_InnerStream; delete m_InnerStream;
m_OwnsStream = false;
}
} }

1
lib/base/stdiostream.h
View File

@ -33,6 +33,7 @@ public:
typedef weak_ptr<StdioStream> WeakPtr; typedef weak_ptr<StdioStream> WeakPtr;
StdioStream(std::iostream *innerStream, bool ownsStream); StdioStream(std::iostream *innerStream, bool ownsStream);
~StdioStream(void);
virtual size_t Read(void *buffer, size_t size); virtual size_t Read(void *buffer, size_t size);
virtual void Write(const void *buffer, size_t size); virtual void Write(const void *buffer, size_t size);