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

Fix crash in JsonRpcConnection::MessageHandlerWrapper

Browse Source 
fixes #12506
This commit is contained in:
Gunnar Beutner 2016-08-22 16:35:16 +02:00
parent 4c011c5eaa
commit f4dce0fe72
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/remote/httpserverconnection.cpp
View File

@ -83,11 +83,7 @@ void HttpServerConnection::Disconnect(void)
m_CurrentRequest.~HttpRequest(); m_CurrentRequest.~HttpRequest();
new (&m_CurrentRequest) HttpRequest(Stream::Ptr()); new (&m_CurrentRequest) HttpRequest(Stream::Ptr());
{ m_Stream->Close();
Stream::Ptr stream = m_Stream;
m_Stream.reset();
stream->Close();
}
} }
bool HttpServerConnection::ProcessMessage(void) bool HttpServerConnection::ProcessMessage(void)
@ -211,9 +207,6 @@ void HttpServerConnection::DataAvailableHandler(void)
{ {
bool close = false; bool close = false;
if (!m_Stream)
return;
if (!m_Stream->IsEof()) { if (!m_Stream->IsEof()) {
boost::mutex::scoped_lock lock(m_DataHandlerMutex); boost::mutex::scoped_lock lock(m_DataHandlerMutex);

6
lib/remote/jsonrpcconnection.cpp
View File

@ -129,11 +129,7 @@ void JsonRpcConnection::Disconnect(void)
Log(LogWarning, "JsonRpcConnection") Log(LogWarning, "JsonRpcConnection")
<< "API client disconnected for identity '" << m_Identity << "'"; << "API client disconnected for identity '" << m_Identity << "'";
{ m_Stream->Close();
Stream::Ptr stream = m_Stream;
m_Stream.reset();
stream->Close();
}
if (m_Endpoint) if (m_Endpoint)
m_Endpoint->RemoveClient(this); m_Endpoint->RemoveClient(this);