boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-31 13:27:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race in test stream

Browse Source 
Resolve: #1594

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
This commit is contained in:
Damian Jarek
2019-04-29 14:12:46 +02:00
parent 41040a21f0
commit fd52df9206
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
Version 254:
* Fix data race in test::stream::connect
--------------------------------------------------------------------------------
Version 253: Version 253:
* Fix async_detect_ssl handler type * Fix async_detect_ssl handler type

3
include/boost/beast/_experimental/test/impl/stream.ipp
View File

@@ -262,6 +262,9 @@ connect(stream& remote)
{ {
BOOST_ASSERT(! out_.lock()); BOOST_ASSERT(! out_.lock());
BOOST_ASSERT(! remote.out_.lock()); BOOST_ASSERT(! remote.out_.lock());
std::lock(in_->m, remote.in_->m);
std::lock_guard<std::mutex> guard1{in_->m, std::adopt_lock};
std::lock_guard<std::mutex> guard2{remote.in_->m, std::adopt_lock};
out_ = remote.in_; out_ = remote.in_;
remote.out_ = in_; remote.out_ = in_;
in_->code = status::ok; in_->code = status::ok;