TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Fix incorrect noexcept on string::compare overloads [PR123991]

Browse Source 
These compare overloads throw when the pos index is out of range, not
only when the const T& parameter throws on conversion to string_view.

Remove the incorrect conditional noexcept-specifier from the two
overloads that can throw.

libstdc++-v3/ChangeLog:

	PR libstdc++/123991
	* include/bits/basic_string.h (compare(size_type, size_type, T)):
	Remove noexcept-specifier.
	(compare(size_type, size_type, T, size_type, size_type)):
	Likewise.
	* include/bits/cow_string.h (compare(size_type, size_type, T)):
	Remove noexcept-specifier.
	(compare(size_type, size_type, T, size_type, size_type)):
	Likewise.
	* testsuite/21_strings/basic_string/operations/compare/char/123991.cc:
	New test.
	* testsuite/21_strings/basic_string/operations/compare/wchar_t/123991.cc:
	New test.

Reviewed-by: Nathan Myers <nmyers@redhat.com>
This commit is contained in:
Jonathan Wakely
2026-02-09 10:48:44 +00:00
committed by Jonathan Wakely
parent 4d2af07350
commit 0912dfcd1e
4 changed files with 112 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/include/bits/basic_string.h
View File

@@ -3524,7 +3524,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_GLIBCXX_NODISCARD _GLIBCXX20_CONSTEXPR
_If_sv<_Tp, int>
compare(size_type __pos, size_type __n, const _Tp& __svt) const
noexcept(is_same<_Tp, __sv_type>::value)
{
__sv_type __sv = __svt;
return __sv_type(*this).substr(__pos, __n).compare(__sv);
@@ -3545,7 +3544,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_If_sv<_Tp, int>
compare(size_type __pos1, size_type __n1, const _Tp& __svt,
size_type __pos2, size_type __n2 = npos) const
noexcept(is_same<_Tp, __sv_type>::value)
{
__sv_type __sv = __svt;
return __sv_type(*this)

2
libstdc++-v3/include/bits/cow_string.h
View File

@@ -2998,7 +2998,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp>
_If_sv<_Tp, int>
compare(size_type __pos, size_type __n, const _Tp& __svt) const
noexcept(is_same<_Tp, __sv_type>::value)
{
__sv_type __sv = __svt;
return __sv_type(*this).substr(__pos, __n).compare(__sv);
@@ -3018,7 +3017,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_If_sv<_Tp, int>
compare(size_type __pos1, size_type __n1, const _Tp& __svt,
size_type __pos2, size_type __n2 = npos) const
noexcept(is_same<_Tp, __sv_type>::value)
{
__sv_type __sv = __svt;
return __sv_type(*this)

56
libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/123991.cc Normal file
View File

@@ -0,0 +1,56 @@
// { dg-do run { target c++17 } }
// Bug 123991 - std::string::compare crashes instead of throwing
#include <string>
#include <string_view>
#include <stdexcept>
#include <testsuite_hooks.h>
void
test_compare_3arg()
{
std::string_view sv;
std::string s;
static_assert( ! noexcept(s.compare(0, 0, sv)) );
#ifdef __cpp_exceptions
try
{
(void) s.compare(1, 0, sv);
VERIFY(false);
}
catch (const std::out_of_range&)
{ }
#endif
}
void
test_compare_5arg()
{
std::string_view sv;
std::string s;
static_assert( ! noexcept(s.compare(0, 0, sv, 0, 0)) );
#ifdef __cpp_exceptions
try
{
(void) s.compare(1, 0, sv, 0, 0);
VERIFY(false);
}
catch (const std::out_of_range&)
{ }
try
{
(void) s.compare(0, 0, sv, 1, 0);
VERIFY(false);
}
catch (const std::out_of_range&)
{ }
#endif
}
int main()
{
test_compare_3arg();
test_compare_5arg();
}

56
libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/123991.cc Normal file
View File

@@ -0,0 +1,56 @@
// { dg-do run { target c++17 } }
// Bug 123991 - std::string::compare crashes instead of throwing
#include <string>
#include <string_view>
#include <stdexcept>
#include <testsuite_hooks.h>
void
test_compare_3arg()
{
std::wstring_view sv;
std::wstring s;
static_assert( ! noexcept(s.compare(0, 0, sv)) );
#ifdef __cpp_exceptions
try
{
(void) s.compare(1, 0, sv);
VERIFY(false);
}
catch (const std::out_of_range&)
{ }
#endif
}
void
test_compare_5arg()
{
std::wstring_view sv;
std::wstring s;
static_assert( ! noexcept(s.compare(0, 0, sv, 0, 0)) );
#ifdef __cpp_exceptions
try
{
(void) s.compare(1, 0, sv, 0, 0);
VERIFY(false);
}
catch (const std::out_of_range&)
{ }
try
{
(void) s.compare(0, 0, sv, 1, 0);
VERIFY(false);
}
catch (const std::out_of_range&)
{ }
#endif
}
int main()
{
test_compare_3arg();
test_compare_5arg();
}