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 #7483 from Icinga/bugfix/jsonrpc-boost-asio-coroutine-exceptions 

JsonRpcConnection: Don't swallow exceptions in Boost.Coroutine
This commit is contained in:
Michael Friedrich 2019-09-09 10:21:21 +02:00 committed by GitHub
parent fbee705105 ebb0826be0
commit 5aa5ab956d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/remote/httpserverconnection.cpp
View File

@ -78,6 +78,14 @@ void HttpServerConnection::Disconnect()
Log(LogInformation, "HttpServerConnection") Log(LogInformation, "HttpServerConnection")
<< "HTTP client disconnected (from " << m_PeerAddress << ")"; << "HTTP client disconnected (from " << m_PeerAddress << ")";
/*
* Do not swallow exceptions in a coroutine.
* https://github.com/Icinga/icinga2/issues/7351
* We must not catch `detail::forced_unwind exception` as
* this is used for unwinding the stack.
*
* Just use the error_code dummy here.
*/
boost::system::error_code ec; boost::system::error_code ec;
m_Stream->next_layer().async_shutdown(yc[ec]); m_Stream->next_layer().async_shutdown(yc[ec]);

25
lib/remote/jsonrpcconnection.cpp
View File

@ -214,20 +214,21 @@ void JsonRpcConnection::Disconnect()
m_WriterDone.Wait(yc); m_WriterDone.Wait(yc);
try { /*
m_Stream->next_layer().async_shutdown(yc); * Do not swallow exceptions in a coroutine.
} catch (...) { * https://github.com/Icinga/icinga2/issues/7351
} * We must not catch `detail::forced_unwind exception` as
* this is used for unwinding the stack.
*
* Just use the error_code dummy here.
*/
boost::system::error_code ec;
try { m_Stream->next_layer().async_shutdown(yc[ec]);
m_Stream->lowest_layer().shutdown(m_Stream->lowest_layer().shutdown_both);
} catch (...) {
}
try { m_Stream->lowest_layer().shutdown(m_Stream->lowest_layer().shutdown_both, ec);
m_Stream->lowest_layer().cancel();
} catch (...) { m_Stream->lowest_layer().cancel(ec);
}
m_CheckLivenessTimer.cancel(); m_CheckLivenessTimer.cancel();
m_HeartbeatTimer.cancel(); m_HeartbeatTimer.cancel();