提交 c0e1c097 编写于 作者: B blake2-ppc

std::vec: Use a valid value as lifetime dummy in iterator

The current implementation uses `&v[0]` for the lifetime struct field,
but that is a dangling pointer for iterators derived from zero-length
slices.

Example:

    let v: [int, ..0] = [];  println!("{:?}", v.iter())

    std::vec::VecIterator<,int>{ptr: (0x7f3768626100 as *()), end: (0x7f3768626100 as *()), lifetime: &139875951207128}

To replace this parameter, use a field of type `Option<&'self ()>`
that is simply initialized with `None`, but still allows the iterator to
have a lifetime parameter.
上级 48499c74
......@@ -932,11 +932,11 @@ fn iter(self) -> VecIterator<'self, T> {
if sys::size_of::<T>() == 0 {
VecIterator{ptr: p,
end: (p as uint + self.len()) as *T,
lifetime: cast::transmute(p)}
lifetime: None}
} else {
VecIterator{ptr: p,
end: p.offset(self.len() as int),
lifetime: cast::transmute(p)}
lifetime: None}
}
}
}
......@@ -1940,11 +1940,11 @@ fn mut_iter(self) -> VecMutIterator<'self, T> {
if sys::size_of::<T>() == 0 {
VecMutIterator{ptr: p,
end: (p as uint + self.len()) as *mut T,
lifetime: cast::transmute(p)}
lifetime: None}
} else {
VecMutIterator{ptr: p,
end: p.offset(self.len() as int),
lifetime: cast::transmute(p)}
lifetime: None}
}
}
}
......@@ -2389,7 +2389,7 @@ fn idx(&self, index: uint) -> Option<&'self T> {
pub struct VecIterator<'self, T> {
priv ptr: *T,
priv end: *T,
priv lifetime: &'self T // FIXME: #5922
priv lifetime: Option<&'self ()> // FIXME: #5922
}
iterator!{impl VecIterator -> &'self T}
double_ended_iterator!{impl VecIterator -> &'self T}
......@@ -2407,7 +2407,7 @@ fn clone(&self) -> VecIterator<'self, T> { *self }
pub struct VecMutIterator<'self, T> {
priv ptr: *mut T,
priv end: *mut T,
priv lifetime: &'self mut T // FIXME: #5922
priv lifetime: Option<&'self mut ()> // FIXME: #5922
}
iterator!{impl VecMutIterator -> &'self mut T}
double_ended_iterator!{impl VecMutIterator -> &'self mut T}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册