OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix pointer invalidation when extnding a vector from an untrusted iterator

This commit is contained in:
Ralf Jung 2020-03-30 10:38:21 +02:00
parent 6556549fa6
commit 86c1c43420
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/liballoc/vec.rs
View File

@ -2019,6 +2019,8 @@ where
let (lower, _) = iterator.size_hint();
let mut vector = Vec::with_capacity(lower.saturating_add(1));
unsafe {
// `vector` is new, cannot have aliases, so us getting exclusive references
// here is okay.
ptr::write(vector.get_unchecked_mut(0), element);
vector.set_len(1);
}
@ -2145,7 +2147,7 @@ impl<T> Vec<T> {
self.reserve(lower.saturating_add(1));
}
unsafe {
ptr::write(self.get_unchecked_mut(len), element);
ptr::write(self.as_mut_ptr().add(len), element);
// NB can't overflow since we would have had to alloc the address space
self.set_len(len + 1);
}