nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-04 04:39:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle the case where src==dst in upcall_vec_append.

Browse Source
This commit is contained in:
Michael Sullivan 2011-06-24 16:22:39 -07:00 committed by Brian Anderson
parent 36fb754476
commit 8ad7f3b56b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rt/rust_upcall.cpp
View File

@ -478,6 +478,12 @@ upcall_vec_append(rust_task *task, type_desc *t, type_desc *elem_t,
size_t n_dst_bytes = skip_null ? dst->fill - 1 : dst->fill; size_t n_dst_bytes = skip_null ? dst->fill - 1 : dst->fill;
rust_vec *new_vec = vec_grow(task, dst, n_src_bytes, &need_copy, t); rust_vec *new_vec = vec_grow(task, dst, n_src_bytes, &need_copy, t);
// If src and dst are the same (due to "v += v"), then dst getting
// resized causes src to move as well.
if (dst == src) {
src = new_vec;
}
if (need_copy) { if (need_copy) {
// Copy any dst elements in, omitting null if doing str. // Copy any dst elements in, omitting null if doing str.
copy_elements(task, elem_t, &new_vec->data, &dst->data, n_dst_bytes); copy_elements(task, elem_t, &new_vec->data, &dst->data, n_dst_bytes);