ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak when a connection fails references #323

Browse Source
This commit is contained in:
Peter Thorson
2014-03-02 22:12:38 -06:00
parent af15537205
commit c5b5492e5c
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.md
View File

@@ -48,6 +48,8 @@ HEAD
code. Thank you Robin Rowe for reporting.
- Bug: Fix an issue where custom timeout values weren't being propagated from
endpoints to new connections.
- Bug: Fix a memory leak when a connection fails. #323 Thank you droppy for
reporting.
- Compatibility: Fix compile time conflict with Visual Studio's MIN/MAX macros.
Thank you Robin Rowe for reporting.
- Documentation: Examples and test suite build system now defaults to clang on

34
websocketpp/transport/asio/connection.hpp
View File

@@ -796,6 +796,11 @@ protected:
m_read_handler = handler;
if (!m_read_handler) {
m_alog.write(log::alevel::devel,
"asio con async_read_at_least called with bad handler");
}
boost::asio::async_read(
socket_con_type::get_socket(),
boost::asio::buffer(buf,len),
@@ -810,6 +815,8 @@ protected:
void handle_async_read(boost::system::error_code const & ec,
size_t bytes_transferred)
{
m_alog.write(log::alevel::devel, "asio con handle_async_read");
// translate boost error codes into more lib::error_codes
lib::error_code tec;
if (ec == boost::asio::error::eof) {
@@ -828,7 +835,16 @@ protected:
log_err(log::elevel::info,"asio async_read_at_least",ec);
}
}
m_read_handler(tec,bytes_transferred);
if (m_read_handler) {
m_read_handler(tec,bytes_transferred);
// TODO: why does this line break things?
//m_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
} else {
// This can happen in cases where the connection is terminated while
// the transport is waiting on a read.
m_alog.write(log::alevel::devel,
"handle_async_read called with null read handler");
}
}
void async_write(const char* buf, size_t len, write_handler handler) {
@@ -882,11 +898,20 @@ protected:
size_t bytes_transferred)
{
m_bufs.clear();
lib::error_code tec;
if (ec) {
log_err(log::elevel::info,"asio async_write",ec);
m_write_handler(make_error_code(transport::error::pass_through));
tec = make_error_code(transport::error::pass_through);
}
if (m_write_handler) {
m_write_handler(tec);
// TODO: why does this line break things?
//m_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
} else {
m_write_handler(lib::error_code());
// This can happen in cases where the connection is terminated while
// the transport is waiting on a read.
m_alog.write(log::alevel::devel,
"handle_async_write called with null write handler");
}
}
@@ -941,6 +966,9 @@ protected:
m_async_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
m_init_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
m_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
m_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
timer_ptr shutdown_timer;
shutdown_timer = set_timer(
config::timeout_socket_shutdown,