[committed 1/4] libstdc++ Fix undefined behaviour in testsuite
Jonathan Wakely
jwakely@redhat.com
Tue May 4 22:17:43 GMT 2021
Fix some test bugs found by ubsan.
libstdc++-v3/ChangeLog:
* testsuite/20_util/from_chars/3.cc: Use unsigned type to avoid
overflow.
* testsuite/24_iterators/reverse_iterator/2.cc: Do not add
non-zero value to null pointer.
* testsuite/25_algorithms/copy_backward/move_iterators/69478.cc:
Use past-the-end iterator for result.
* testsuite/25_algorithms/move_backward/69478.cc: Likewise.
* testsuite/25_algorithms/move_backward/93872.cc: Likewise.
Tested x86_64-linux. Committed to trunk.
-------------- next part --------------
commit 6fb8b67089119b737ccb38f75f403b8d279e2229
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue May 4 15:28:39 2021
libstdc++ Fix undefined behaviour in testsuite
Fix some test bugs found by ubsan.
libstdc++-v3/ChangeLog:
* testsuite/20_util/from_chars/3.cc: Use unsigned type to avoid
overflow.
* testsuite/24_iterators/reverse_iterator/2.cc: Do not add
non-zero value to null pointer.
* testsuite/25_algorithms/copy_backward/move_iterators/69478.cc:
Use past-the-end iterator for result.
* testsuite/25_algorithms/move_backward/69478.cc: Likewise.
* testsuite/25_algorithms/move_backward/93872.cc: Likewise.
diff --git a/libstdc++-v3/testsuite/20_util/from_chars/3.cc b/libstdc++-v3/testsuite/20_util/from_chars/3.cc
index c99353a7284..d3d70394ed9 100644
--- a/libstdc++-v3/testsuite/20_util/from_chars/3.cc
+++ b/libstdc++-v3/testsuite/20_util/from_chars/3.cc
@@ -29,7 +29,7 @@ long long
read(const char* first, const char* last, int base)
{
long long val = 0;
- long long place = 1;
+ unsigned long long place = 1;
while (last > first)
{
val += (*--last - '0') * place;
diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc
index a6d7d6b0191..633c1426b96 100644
--- a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc
+++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc
@@ -27,7 +27,7 @@ void test02()
iterator_type it01;
iterator_type it02;
- // Sanity check non-member operators and functions can be instantiated.
+ // Sanity check non-member operators and functions can be instantiated.
it01 == it02;
it01 != it02;
it01 < it02;
@@ -35,11 +35,11 @@ void test02()
it01 > it02;
it01 >= it02;
it01 - it02;
- 5 + it02;
+ 0 + it02;
}
-int main()
-{
+int main()
+{
test02();
return 0;
}
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc
index 88a01b84a8e..9c84cfb176c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc
@@ -35,6 +35,6 @@ test01()
static_assert(std::is_trivial<trivial_rvalstruct>::value, "");
trivial_rvalstruct a[1], b[1];
- copy_backward(std::make_move_iterator(a), std::make_move_iterator(a+1), b);
+ copy_backward(std::make_move_iterator(a), std::make_move_iterator(a+1), b+1);
}
// { dg-prune-output "use of deleted" }
diff --git a/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc b/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc
index 25bfe29fc14..10e31be1e08 100644
--- a/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc
@@ -35,6 +35,6 @@ test01()
static_assert(std::is_trivial<trivial_rvalstruct>::value, "");
trivial_rvalstruct a[1], b[1];
- std::move_backward(a, a + 1, b);
+ std::move_backward(a, a + 1, b + 1);
}
// { dg-prune-output "use of deleted" }
diff --git a/libstdc++-v3/testsuite/25_algorithms/move_backward/93872.cc b/libstdc++-v3/testsuite/25_algorithms/move_backward/93872.cc
index df96c94b394..a9fd2697f5b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/move_backward/93872.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/move_backward/93872.cc
@@ -35,5 +35,5 @@ void
test01()
{
X a[2], b[2];
- std::move_backward(std::begin(a), std::end(a), std::begin(b));
+ std::move_backward(std::begin(a), std::end(a), std::end(b));
}
More information about the Libstdc++
mailing list