3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't invoke UB when nullptr is passed to StringRef constructor

This commit is contained in:
Martin Hořeňovský 2017-11-13 12:09:19 +01:00
parent e7c23b73da
commit e484236825
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/internal/catch_stringref.cpp
View File

@ -14,8 +14,8 @@
#include "catch_stringref.h" #include "catch_stringref.h"
#include <ostream> #include <ostream>
#include <cassert>
#include <cstring> #include <cstring>
#include <stdexcept>
@ -43,12 +43,12 @@ namespace Catch {
other.m_data = nullptr; other.m_data = nullptr;
} }
StringRef::StringRef( char const* rawChars ) noexcept StringRef::StringRef(char const* rawChars) noexcept
: m_start( rawChars ), : m_start(rawChars),
m_size( static_cast<size_type>( std::strlen( rawChars ) ) ) m_size( (rawChars != nullptr)?
{ (static_cast<size_type>(std::strlen(rawChars))):
assert( rawChars != nullptr ); throw std::domain_error("Cannot create StringRef from nullptr"))
} {}
StringRef::StringRef( char const* rawChars, size_type size ) noexcept StringRef::StringRef( char const* rawChars, size_type size ) noexcept
: m_start( rawChars ), : m_start( rawChars ),