Skip to content

Fix narrow bounds checking in generic gathers #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lpetersen-pixel wants to merge 1 commit into from
Closed

Fix narrow bounds checking in generic gathers #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/xvec/generic/generic_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ template<detail::contiguous_sized_range _Range, std::integral _Idx, typename _Id
constexpr auto gather_from(generic_tag, const _Range& r, const basic_vec<_Idx, _IdxAbi>& indexes, flags<_Flags...> flags)
{
using _Tp = std::ranges::range_value_t<_Range>;
const auto rmax = _Idx(std::min(r.size(), size_t(std::numeric_limits<_Idx>::max())));
const auto rmax = r.size();

if constexpr (contains_flag<flag_unchecked>(flags))
checkStaticMemoryBounds("gather", indexes, rmax);
Expand All @@ -713,7 +713,7 @@ constexpr auto gather_from(generic_tag, const _Range& r, const basic_vec<_Idx, _
for (int i=0; i<numIndexes; ++i)
{
auto idx = indexPtr[i];
result[i] = contains_flag<flag_unchecked>(flags) || (idx < rmax) ? r[idx] : _Tp();
result[i] = contains_flag<flag_unchecked>(flags) || (idx >= 0 && std::cmp_less(+idx, rmax)) ? r[idx] : _Tp();
}

return vec<_Tp, numIndexes>(result);
Expand All @@ -735,7 +735,7 @@ constexpr auto gather_from(generic_tag, const _Range& r,
const basic_vec<_Idx, _IdxAbi>& indexes, flags<_Flags...> flags)
{
using _Tp = std::ranges::range_value_t<_Range>;
const auto rmax = _Idx(std::min(r.size(), size_t(std::numeric_limits<_Idx>::max())));
const auto rmax = r.size();

if constexpr (contains_flag<flag_unchecked>(flags))
checkStaticMemoryBounds("gather", indexes, rmax, mask);
Expand All @@ -754,7 +754,7 @@ constexpr auto gather_from(generic_tag, const _Range& r,
for (int i=0; i<numIndexes; ++i)
{
auto idx = indexPtr[i];
bool validIndex = contains_flag<flag_unchecked>(flags) || (idx < rmax);
bool validIndex = contains_flag<flag_unchecked>(flags) || (idx >= 0 && std::cmp_less(+idx, rmax));
result[i] = validIndex && mb[i] ? r[idx] : _Tp();
}

Expand Down