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

StringRef no longer repoints m_start to m_data after c_str() on a substring. 

This fixes an issue where a self-assignment of a StringRef copy would point into internally (and now dangling) data.
(now self-assignment check is no longer needed)
This commit is contained in:
Phil Nash 2019-05-21 00:04:19 +01:00
parent 71fce429af
commit 96355da34e
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/internal/catch_stringref.cpp
View File

@ -39,9 +39,11 @@ namespace Catch {
}
auto StringRef::c_str() const -> char const* {
if( isSubstring() )
const_cast<StringRef*>( this )->takeOwnership();
return m_start;
if( !isSubstring() )
return m_start;
const_cast<StringRef *>( this )->takeOwnership();
return m_data;
}
auto StringRef::currentData() const noexcept -> char const* {
return m_start;
@ -59,7 +61,6 @@ namespace Catch {
m_data = new char[m_size+1];
memcpy( m_data, m_start, m_size );
m_data[m_size] = '\0';
m_start = m_data;
}
}
auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {

4
include/internal/catch_stringref.h
View File

@ -71,12 +71,12 @@ namespace Catch {
}
auto operator = ( StringRef const &other ) noexcept -> StringRef& {
if( this != &other ) {
// if( this != &other ) {
delete[] m_data;
m_data = nullptr;
m_start = other.m_start;
m_size = other.m_size;
}
// }
return *this;
}

8
projects/SelfTest/IntrospectiveTests/String.tests.cpp
View File

@ -65,7 +65,6 @@ TEST_CASE( "StringRef", "[Strings][StringRef]" ) {
original.c_str(); // Forces it to take ownership
REQUIRE( isSubstring( original ) == false );
REQUIRE( isOwned( original ) );
}
@ -88,14 +87,13 @@ TEST_CASE( "StringRef", "[Strings][StringRef]" ) {
REQUIRE( rawChars == s.currentData() ); // same pointer value
REQUIRE( ss.c_str() != rawChars );
REQUIRE( isSubstring( ss ) == false );
REQUIRE( isOwned( ss ) );
REQUIRE( ss.currentData() != s.currentData() ); // different pointer value
SECTION( "Self-assignment after substring" ) {
ss = *&ss; // the *& are there to suppress warnings (see: "Improvements to Clang's diagnostics" in https://rev.ng/gitlab/revng-bar-2019/clang/raw/master/docs/ReleaseNotes.rst)
REQUIRE(isOwned(ss) == true);
REQUIRE( isOwned(ss) == false );
REQUIRE( ss == "hello" );
REQUIRE( rawChars == ss.currentData() ); // same pointer value
}
}