bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

vec: with_capacity: check for overflow

Browse source 
Fixes #10271
This commit is contained in:
Corey Richardson 2013-11-11 05:45:30 -05:00
parent 46100c0622
commit a46b2b8e7a
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/vec.rs
View file

@ -186,7 +186,11 @@ pub fn with_capacity<T>(capacity: uint) -> ~[T] {
vec vec
} else { } else {
let alloc = capacity * mem::nonzero_size_of::<T>(); let alloc = capacity * mem::nonzero_size_of::<T>();
let ptr = malloc_raw(alloc + mem::size_of::<Vec<()>>()) as *mut Vec<()>; let size = alloc + mem::size_of::<Vec<()>>();
if alloc / mem::nonzero_size_of::<T>() != capacity || size < alloc {
fail!("vector size is too large: {}", capacity);
}
let ptr = malloc_raw(size) as *mut Vec<()>;
(*ptr).alloc = alloc; (*ptr).alloc = alloc;
(*ptr).fill = 0; (*ptr).fill = 0;
cast::transmute(ptr) cast::transmute(ptr)