In subspan function, add static checks on extents

ETLCPP · Feb 14, 2024 · 5275598 · 5275598
1 parent 8403165
commit 5275598
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/include/etl/span.h b/include/etl/span.h
@@ -331,6 +331,12 @@ namespace etl
     ETL_NODISCARD ETL_CONSTEXPR
     etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET> subspan() const ETL_NOEXCEPT
     {
+      //if extent is static, check that OFFSET is within the original span
+      static_assert((extent != etl::dynamic_extent) ? OFFSET <= extent : true);
+
+      //if count is also static, check that OFFSET + COUNT is within the original span
+      static_assert((extent != etl::dynamic_extent) && (COUNT != etl::dynamic_extent) ? COUNT <= (extent - OFFSET) : true);
+
       return (COUNT == etl::dynamic_extent) ? etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET>(pbegin + OFFSET, (pbegin + Extent))
                                             : etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET>(pbegin + OFFSET, pbegin + OFFSET + COUNT);
     }