catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Fix ReusableStringStream to access the container under the lock (#3031)
- Commit
f7e7fa0983e83b922cb6336ff3a55d33b2873943- Author
- Duncan Horn ·
- Committer
- GitHub
- Parents
b626e4c7aedb
Changes
src/catch2/internal/catch_reusable_string_stream.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/catch2/internal/catch_reusable_string_stream.cpp b/src/catch2/internal/catch_reusable_string_stream.cpp index a2dd5a63..875da4da 100644 --- a/src/catch2/internal/catch_reusable_string_stream.cpp +++ b/src/catch2/internal/catch_reusable_string_stream.cpp @@ -12,6 +12,7 @@ #include <cstdio> #include <sstream> +#include <tuple> #include <vector> namespace Catch { @@ -23,16 +24,16 @@ namespace Catch { std::ostringstream m_referenceStream; // Used for copy state/ flags from Detail::Mutex m_mutex; - auto add() -> std::size_t { + auto add() -> std::pair<std::size_t, std::ostringstream*> { Detail::LockGuard _( m_mutex ); if( m_unused.empty() ) { m_streams.push_back( Detail::make_unique<std::ostringstream>() ); - return m_streams.size()-1; + return { m_streams.size()-1, m_streams.back().get() }; } else { auto index = m_unused.back(); m_unused.pop_back(); - return index; + return { index, m_streams[index].get() }; } } @@ -46,10 +47,10 @@ namespace Catch { } }; - ReusableStringStream::ReusableStringStream() - : m_index( Singleton<StringStreams>::getMutable().add() ), - m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() ) - {} + ReusableStringStream::ReusableStringStream() { + std::tie( m_index, m_oss ) = + Singleton<StringStreams>::getMutable().add(); + } ReusableStringStream::~ReusableStringStream() { static_cast<std::ostringstream*>( m_oss )->str("");