para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix negative indices to multi_span not being caught.

Browse Source 
Negative indices to multi_span are not flagged with neither exception nor abort.
This commit is contained in:
Neil MacIntosh 2016-09-20 08:44:41 -07:00 committed by GitHub
commit 75fb2236ed
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gsl/multi_span
View File

@ -443,7 +443,7 @@ namespace details
template <typename T, size_t Dim = 0> template <typename T, size_t Dim = 0>
size_type linearize(const T& arr) const size_type linearize(const T& arr) const
{ {
Expects(arr[Dim] < CurrentRange); // Index is out of range Expects(arr[Dim] >= 0 && arr[Dim] < CurrentRange); // Index is out of range
return this->Base::totalSize() * arr[Dim] + return this->Base::totalSize() * arr[Dim] +
this->Base::template linearize<T, Dim + 1>(arr); this->Base::template linearize<T, Dim + 1>(arr);
} }
@ -1510,7 +1510,7 @@ public:
template <bool Enabled = (Rank > 1), typename Ret = std::enable_if_t<Enabled, sliced_type>> template <bool Enabled = (Rank > 1), typename Ret = std::enable_if_t<Enabled, sliced_type>>
constexpr Ret operator[](size_type idx) const noexcept constexpr Ret operator[](size_type idx) const noexcept
{ {
Expects(idx < bounds_.size()); // index is out of bounds of the array Expects(idx >= 0 && idx < bounds_.size()); // index is out of bounds of the array
const size_type ridx = idx * bounds_.stride(); const size_type ridx = idx * bounds_.stride();
// index is out of bounds of the underlying data // index is out of bounds of the underlying data

6
tests/multi_span_tests.cpp
View File

@ -1084,6 +1084,12 @@ SUITE(multi_span_tests)
CHECK_THROW(av[10][2], fail_fast); CHECK_THROW(av[10][2], fail_fast);
CHECK_THROW((av[{10, 2}]), fail_fast); CHECK_THROW((av[{10, 2}]), fail_fast);
CHECK_THROW(av[-1][0], fail_fast);
CHECK_THROW((av[{-1, 0}]), fail_fast);
CHECK_THROW(av[0][-1], fail_fast);
CHECK_THROW((av[{0, -1}]), fail_fast);
} }
void overloaded_func(multi_span<const int, dynamic_range, 3, 5> exp, int expected_value) void overloaded_func(multi_span<const int, dynamic_range, 3, 5> exp, int expected_value)