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

Fix random crash during client disconnect

Browse source
This commit is contained in:
badaix 2019-11-22 19:35:05 +01:00
parent 0b94a56fe5
commit 557c742e47
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
server/stream_session.cpp
View file

@ -41,7 +41,17 @@ StreamSession::~StreamSession()
void StreamSession::read_next()
{
auto self(shared_from_this());
shared_ptr<StreamSession> self;
try
{
self = shared_from_this();
}
catch (const std::bad_weak_ptr& e)
{
LOG(ERROR) << "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 {
if (ec)
@ -125,7 +135,17 @@ void StreamSession::stop()
void StreamSession::send_next()
{
auto self(shared_from_this());
shared_ptr<StreamSession> self;
try
{
self = shared_from_this();
}
catch (const std::bad_weak_ptr& e)
{
LOG(ERROR) << "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) {
@ -144,7 +164,8 @@ void StreamSession::send_next()
void StreamSession::sendAsync(shared_const_buffer const_buf, bool send_now)
{
strand_.post([this, const_buf, send_now]() {
auto self = shared_from_this();
strand_.post([this, self, const_buf, send_now]() {
if (send_now)
messages_.push_front(const_buf);
else