OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Add valid range checks to std::span constructors [PR98421]

Browse Source 
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	PR libstdc++/98421
	* include/std/span (span(Iter, size_type), span(Iter, Iter)):
	Add valid range checks.
	* testsuite/23_containers/span/cons_1_assert_neg.cc: New test.
	* testsuite/23_containers/span/cons_2_assert_neg.cc: New test.
This commit is contained in:
Jonathan Wakely 2021-08-31 17:34:51 +01:00
parent f1e7319956
commit ef7becc9c8
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/include/std/span
View File

@ -160,6 +160,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
__glibcxx_assert(__count == _Extent);
}
__glibcxx_requires_valid_range(__first, __first + __count);
}
template<contiguous_iterator _It, sized_sentinel_for<_It> _End>
@ -175,6 +176,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
__glibcxx_assert((__last - __first) == _Extent);
}
__glibcxx_requires_valid_range(__first, __last);
}
template<size_t _ArrayExtent>

14
libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc Normal file
View File

@ -0,0 +1,14 @@
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
#undef _GLIBCXX_DEBUG
#define _GLIBCXX_DEBUG
#include <span>
#include <vector>
int main()
{
std::vector<int> v(2);
std::span<int, std::dynamic_extent> s(v.begin(), 3);
}

14
libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc Normal file
View File

@ -0,0 +1,14 @@
// { dg-options "-std=gnu++2a" }
// { dg-do run { xfail *-*-* } }
// { dg-require-effective-target c++2a }
#undef _GLIBCXX_DEBUG
#define _GLIBCXX_DEBUG
#include <span>
#include <vector>
int main()
{
std::vector<int> v(2), w(1);
std::span<int, std::dynamic_extent> s(v.begin(), w.end());
}