ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic in HTTP/S server:

Browse Source 
These bugs do not affect production code since callers do not invoke
`write` multiple times, but these would become a problem in the future.

* Access to Peer::write_queue_ is synchronized correctly.
* Remove unsafe access to deleted container element.
This commit is contained in:
Vinnie Falco
2014-12-11 15:39:34 -08:00
parent 409b8bac00
commit f12b15d22b
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ripple/server/impl/Peer.h
View File

@@ -397,34 +397,33 @@ Peer<Impl>::do_write (yield_context yield)
for(;;)
{
bytes_out_ += bytes;
bool empty;
void const* data;
{
std::lock_guard <std::mutex> lock (mutex_);
buffer& b = write_queue_.front();
b.used += bytes;
if (b.used < b.bytes)
assert(! write_queue_.empty());
buffer& b1 = write_queue_.front();
b1.used += bytes;
if (b1.used >= b1.bytes)
{
empty = false;
write_queue_.pop_front();
if (write_queue_.empty())
break;
buffer& b2 = write_queue_.front();
data = b2.data.get();
bytes = b2.bytes;
}
else
{
write_queue_.pop_front();
empty = write_queue_.empty();
data = b1.data.get() + b1.used;
bytes = b1.bytes - b1.used;
}
data = b.data.get() + b.used;
bytes = b.bytes - b.used;
}
if (empty)
break;
start_timer();
bytes = boost::asio::async_write (impl().stream_,
boost::asio::buffer (data, bytes),
boost::asio::transfer_at_least(1), yield[ec]);
cancel_timer();
if (ec)
return fail (ec, "write");
}
@@ -532,8 +531,11 @@ Peer<Impl>::complete()
message_ = beast::http::message{};
complete_ = true;
if (! write_queue_.empty())
return;
{
std::lock_guard<std::mutex> lock(mutex_);
if (! write_queue_.empty())
return;
}
// keep-alive
boost::asio::spawn (strand_, std::bind (&Peer<Impl>::do_read,
@@ -555,8 +557,11 @@ Peer<Impl>::close (bool graceful)
if (graceful)
{
graceful_ = true;
if (! write_queue_.empty())
return;
{
std::lock_guard<std::mutex> lock(mutex_);
if (! write_queue_.empty())
return;
}
return do_close();
}