3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix StringRef self-assignment after substring

Browse Source 
Thanks to Alex Tkachenko for spotting it.
This commit is contained in:
Phil Nash 2019-05-18 17:54:06 +01:00
parent e680c4b9fb
commit 3bce8ba14b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_stringref.h
View File

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

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

@ -92,6 +92,11 @@ TEST_CASE( "StringRef", "[Strings][StringRef]" ) {
REQUIRE( isOwned( ss ) ); REQUIRE( isOwned( ss ) );
REQUIRE( ss.currentData() != s.currentData() ); // different pointer value REQUIRE( ss.currentData() != s.currentData() ); // different pointer value
SECTION( "Self-assignment after substring" ) {
ss = ss;
REQUIRE(isOwned(ss) == true);
}
} }
SECTION( "non-zero-based substring") { SECTION( "non-zero-based substring") {