1
Fork 0

Fix possible soundness issue in ensure_subset_of

This commit is contained in:
dylni 2021-01-18 09:22:17 -05:00
parent 9d29793614
commit cb647f3e8e
8 changed files with 112 additions and 110 deletions

View file

@ -1063,7 +1063,7 @@ impl<T> VecDeque<T> {
where
R: RangeBounds<usize>,
{
let Range { start, end } = range.ensure_subset_of(..self.len());
let Range { start, end } = Range::ensure_subset_of(range, ..self.len());
let tail = self.wrap_add(self.tail, start);
let head = self.wrap_add(self.tail, end);
(tail, head)

View file

@ -115,7 +115,7 @@
#![feature(or_patterns)]
#![feature(pattern)]
#![feature(ptr_internals)]
#![feature(range_bounds_ensure_subset_of)]
#![feature(range_ensure_subset_of)]
#![feature(rustc_attrs)]
#![feature(receiver_trait)]
#![cfg_attr(bootstrap, feature(min_const_generics))]

View file

@ -1510,7 +1510,7 @@ impl String {
// of the vector version. The data is just plain bytes.
// Because the range removal happens in Drop, if the Drain iterator is leaked,
// the removal will not happen.
let Range { start, end } = range.ensure_subset_of(..self.len());
let Range { start, end } = Range::ensure_subset_of(range, ..self.len());
assert!(self.is_char_boundary(start));
assert!(self.is_char_boundary(end));

View file

@ -1650,7 +1650,7 @@ impl<T, A: Allocator> Vec<T, A> {
// the hole, and the vector length is restored to the new length.
//
let len = self.len();
let Range { start, end } = range.ensure_subset_of(..len);
let Range { start, end } = Range::ensure_subset_of(range, ..len);
unsafe {
// set self.vec length's to start, to be safe in case Drain is leaked