From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 22 Aug 2016 14:35:16 +0000 (+0200)
Subject: Fix crash in JsonRpcConnection::MessageHandlerWrapper
X-Git-Tag: v2.5.0~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4dce0fe729dedf8138788a535e01fd8c6cde766;p=icinga2

Fix crash in JsonRpcConnection::MessageHandlerWrapper

fixes #12506
---

diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index acf5ccd1d..d3f75868b 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -83,11 +83,7 @@ void HttpServerConnection::Disconnect(void)
 	m_CurrentRequest.~HttpRequest();
 	new (&m_CurrentRequest) HttpRequest(Stream::Ptr());
 
-	{
-		Stream::Ptr stream = m_Stream;
-		m_Stream.reset();
-		stream->Close();
-	}
+	m_Stream->Close();
 }
 
 bool HttpServerConnection::ProcessMessage(void)
@@ -211,9 +207,6 @@ void HttpServerConnection::DataAvailableHandler(void)
 {
 	bool close = false;
 
-	if (!m_Stream)
-		return;
-
 	if (!m_Stream->IsEof()) {
 		boost::mutex::scoped_lock lock(m_DataHandlerMutex);
 
diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index 54c393550..69321a63e 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -129,11 +129,7 @@ void JsonRpcConnection::Disconnect(void)
 	Log(LogWarning, "JsonRpcConnection")
 	    << "API client disconnected for identity '" << m_Identity << "'";
 
-	{
-		Stream::Ptr stream = m_Stream;
-		m_Stream.reset();
-		stream->Close();
-	}
+	m_Stream->Close();
 
 	if (m_Endpoint)
 		m_Endpoint->RemoveClient(this);