Skip to content

Don't leak on panic in extend #137

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

Merged
merged 1 commit into from
Jan 4, 2019
Merged

Don't leak on panic in extend #137

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
17 changes: 10 additions & 7 deletions lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,18 +1340,16 @@ impl<A: Array> Extend<A::Item> for SmallVec<A> {
self.reserve(lower_size_bound);

unsafe {
let len = self.len();
let ptr = self.as_mut_ptr().offset(len as isize);
let mut count = 0;
while count < lower_size_bound {
let (ptr, len_ptr, cap) = self.triple_mut();
let mut len = SetLenOnDrop::new(len_ptr);
while len.get() < cap {
if let Some(out) = iter.next() {
ptr::write(ptr.offset(count as isize), out);
count += 1;
ptr::write(ptr.offset(len.get() as isize), out);
len.increment_len(1);
} else {
break;
}
}
self.set_len(len + count);
}

for elem in iter {
Expand Down Expand Up @@ -1560,6 +1558,11 @@ impl<'a> SetLenOnDrop<'a> {
SetLenOnDrop { local_len: *len, len: len }
}

#[inline]
fn get(&self) -> usize {
self.local_len
}

#[inline]
fn increment_len(&mut self, increment: usize) {
self.local_len += increment;
Expand Down