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 #6085 from Icinga/fix/crash-no-endpoint-message-sent 

Fix crash with anonymous clients on certificate signing request and storing sent bytes
This commit is contained in:
Michael Friedrich 2018-02-09 17:30:05 +01:00 committed by GitHub
parent d578b742ac ad7e801db9
commit bb96b77425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/remote/jsonrpcconnection.cpp
View File

@ -114,10 +114,15 @@ void JsonRpcConnection::SendMessage(const Dictionary::Ptr& message)
{
try {
ObjectLock olock(m_Stream);
if (m_Stream->IsEof())
return;
size_t bytesSent = JsonRpc::SendMessage(m_Stream, message);
m_Endpoint->AddMessageSent(bytesSent);
if (m_Endpoint)
m_Endpoint->AddMessageSent(bytesSent);
} catch (const std::exception& ex) {
std::ostringstream info;
info << "Error while sending JSON-RPC message for identity '" << m_Identity << "'";