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
Change how non-nullness is enforce in StringRef constructor
- Commit
0adb04807a2591fcfc3aa5e7158d2fb136a6568c- Author
- Martin Hořeňovský ·
- Parents
f80f28e09aa5
Changes
include/internal/catch_stringref.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/internal/catch_stringref.cpp b/include/internal/catch_stringref.cpp index 60a522ec..f82e60c3 100644 --- a/include/internal/catch_stringref.cpp +++ b/include/internal/catch_stringref.cpp @@ -27,6 +27,13 @@ namespace Catch { return s_emptyStringRef; } + char const* enforceNonNull(char const* ptr) { + if (ptr == nullptr) { + std::abort(); + } + return ptr; + } + } StringRef::StringRef() noexcept @@ -47,10 +54,8 @@ namespace Catch { } StringRef::StringRef(char const* rawChars) noexcept - : m_start(rawChars), - m_size( (rawChars != nullptr)? - (static_cast<size_type>(std::strlen(rawChars))): - throw std::domain_error("Cannot create StringRef from nullptr")) + : m_start( enforceNonNull(rawChars) ), + m_size( static_cast<size_type>(std::strlen(rawChars))) {} StringRef::StringRef( char const* rawChars, size_type size ) noexcept