Skip to content

Commit 8a8279a

Browse files
committed
Do not use msan yet; Boost seems to be not msan-clean
1 parent 7f70dac commit 8a8279a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.travis.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ env:
1515
# Support the sanitizers in clang only
1616
- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
1717
- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
18-
- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
18+
# TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
19+
#- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
1920
matrix:
2021
exclude:
2122
- compiler: g++
2223
env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
2324
- compiler: g++
2425
env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
25-
- compiler: g++
26-
env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
26+
# TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
27+
# - compiler: g++
28+
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
2729
install:
2830
- mkdir -p ${HOME}/bin
2931
- if [ "${CC}" = "gcc" ]; then export TOOLSET="gcc"; ln -s `which g++-4.8` ${HOME}/bin/g++;

boost/network/protocol/http/server/async_server.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ struct async_server_base : server_storage_base, socket_options_base {
132132
void start_listening() {
133133
using boost::asio::ip::tcp;
134134
system::error_code error;
135-
service_.reset(); // this allows repeated cycles of run -> stop ->
136-
// run
135+
// this allows repeated cycles of run -> stop -> run
136+
service_.reset();
137137
tcp::resolver resolver(service_);
138138
tcp::resolver::query query(address_, port_);
139139
tcp::resolver::iterator endpoint_iterator = resolver.resolve(query, error);

0 commit comments

Comments
 (0)