3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-27 15:07:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash during client disconnect

Browse source
This commit is contained in:
badaix 2020-01-25 22:20:02 +01:00
parent 08de66fe70
commit 21d259d0af
6 changed files with 19 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

30
server/stream_session.cpp
View file

@ -45,19 +45,8 @@ StreamSession::~StreamSession()
void StreamSession::read_next()
{
shared_ptr<StreamSession> self;
try
{
self = shared_from_this();
}
catch (const std::bad_weak_ptr& e)
{
LOG(ERROR, LOG_TAG) << "read_next: Error getting shared from this\n";
return;
}
boost::asio::async_read(socket_, boost::asio::buffer(buffer_, base_msg_size_),
boost::asio::bind_executor(strand_, [this, self](boost::system::error_code ec, std::size_t length) mutable {
boost::asio::bind_executor(strand_, [ this, self = shared_from_this() ](boost::system::error_code ec, std::size_t length) mutable {
if (ec)
{
LOG(ERROR, LOG_TAG) << "Error reading message header of length " << length << ": " << ec.message() << "\n";
@ -139,20 +128,9 @@ void StreamSession::stop()
void StreamSession::send_next()
{
shared_ptr<StreamSession> self;
try
{
self = shared_from_this();
}
catch (const std::bad_weak_ptr& e)
{
LOG(ERROR, LOG_TAG) << "send_next: Error getting shared from this\n";
return;
}
auto buffer = messages_.front();
boost::asio::async_write(socket_, buffer, boost::asio::bind_executor(strand_, [this, self, buffer](boost::system::error_code ec, std::size_t length) {
boost::asio::async_write(socket_, buffer,
boost::asio::bind_executor(strand_, [ this, self = shared_from_this(), buffer ](boost::system::error_code ec, std::size_t length) {
messages_.pop_front();
if (ec)
{
@ -168,7 +146,7 @@ void StreamSession::send_next()
void StreamSession::sendAsync(shared_const_buffer const_buf, bool send_now)
{
strand_.post([this, const_buf, send_now]() {
strand_.post([ this, self = shared_from_this(), const_buf, send_now ]() {
if (send_now)
messages_.push_front(const_buf);
else