Fix crash in JsonRpcConnection::MessageHandlerWrapper

fixes #12506

diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index acf5ccd1d6e008aad75b662d34a3cbb0b8bfc271..d3f75868bd9cf19782330c5dbba98606cd58046d 100644 (file)
--- 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 54c393550b35d48b487a511536000100e4289dee..69321a63ebb0f8a7129836950f0717b6b0232176 100644 (file)
--- 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);