M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential unsoundness in ColumnIter::split_at

This commit is contained in:
Sébastien Crozet 2023-01-14 15:37:12 +01:00
parent 1f4ded0c50
commit d54c56fd43
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/base/iter.rs
View File

@ -314,16 +314,17 @@ impl<'a, T, R: Dim, C: Dim, S: 'a + RawStorage<T, R, C>> ColumnIter<'a, T, R, C,
} }
pub(crate) fn split_at(self, index: usize) -> (Self, Self) { pub(crate) fn split_at(self, index: usize) -> (Self, Self) {
// SAFETY: it’s OK even if index > self.range.len() because // SAFETY: this makes sur the generated ranges are valid.
// the iterations will yield None in this case. let split_pos = (self.range.start + index).min(self.range.end);
let left_iter = ColumnIter { let left_iter = ColumnIter {
mat: self.mat, mat: self.mat,
range: self.range.start..(self.range.start + index), range: self.range.start..split_pos,
}; };
let right_iter = ColumnIter { let right_iter = ColumnIter {
mat: self.mat, mat: self.mat,
range: (self.range.start + index)..self.range.end, range: split_pos..self.range.end,
}; };
(left_iter, right_iter) (left_iter, right_iter)
@ -401,19 +402,18 @@ impl<'a, T, R: Dim, C: Dim, S: 'a + RawStorageMut<T, R, C>> ColumnIterMut<'a, T,
} }
pub(crate) fn split_at(self, index: usize) -> (Self, Self) { pub(crate) fn split_at(self, index: usize) -> (Self, Self) {
// SAFETY: it’s OK even if index > self.range.len() because // SAFETY: this makes sur the generated ranges are valid.
// the iterations will yield None in this case. let split_pos = (self.range.start + index).min(self.range.end);
assert!(index <= self.range.len());
let left_iter = ColumnIterMut { let left_iter = ColumnIterMut {
mat: self.mat, mat: self.mat,
range: self.range.start..(self.range.start + index), range: self.range.start..split_pos,
phantom: Default::default(), phantom: Default::default(),
}; };
let right_iter = ColumnIterMut { let right_iter = ColumnIterMut {
mat: self.mat, mat: self.mat,
range: (self.range.start + index)..self.range.end, range: split_pos..self.range.end,
phantom: Default::default(), phantom: Default::default(),
}; };