Check negative indicies in at()

Signed-off-by: Stephan Lachnit <stephanlachnit@debian.org>
kokkos · Aug 21, 2024 · 0accddc · 0accddc
1 parent 4877acf
commit 0accddc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/include/experimental/__p0009_bits/mdspan.hpp b/include/experimental/__p0009_bits/mdspan.hpp
@@ -234,7 +234,7 @@ class mdspan
   {
     size_t r = 0;
     for (const auto& index : {indices...}) {
-      if (index >= __mapping_ref().extents().extent(r)) {
+      if (index >= __mapping_ref().extents().extent(r) || index < 0) {
         throw std::out_of_range(
           "mdspan::at(...," + std::to_string(index) + ",...) out-of-range at rank index " + std::to_string(r) +
           " for mdspan with extent {...," + std::to_string(__mapping_ref().extents().extent(r)) + ",...}");
@@ -254,7 +254,7 @@ class mdspan
   constexpr reference at(const std::array< SizeType, rank()>& indices) const
   {
     for (size_t r = 0; r < indices.size(); ++r) {
-      if (indices[r] >= __mapping_ref().extents().extent(r)) {
+      if (indices[r] >= __mapping_ref().extents().extent(r) || indices[r] < 0) {
         throw std::out_of_range(
           "mdspan::at({...," + std::to_string(indices[r]) + ",...}) out-of-range at rank index " + std::to_string(r) +
           " for mdspan with extent {...," + std::to_string(__mapping_ref().extents().extent(r)) + ",...}");
@@ -274,7 +274,7 @@ class mdspan
   constexpr reference at(std::span<SizeType, rank()> indices) const
   {
     for (size_t r = 0; r < indices.size(); ++r) {
-      if (indices[r] >= __mapping_ref().extents().extent(r)) {
+      if (indices[r] >= __mapping_ref().extents().extent(r) || indices[r] < 0) {
         throw std::out_of_range(
           "mdspan::at({...," + std::to_string(indices[r]) + ",...}) out-of-range at rank index " + std::to_string(r) +
           " for mdspan with extent {...," + std::to_string(__mapping_ref().extents().extent(r)) + ",...}");