diff options
| author | Roy Frostig <[email protected]> | 2010-08-31 13:01:51 -0700 |
|---|---|---|
| committer | Roy Frostig <[email protected]> | 2010-08-31 13:01:57 -0700 |
| commit | 47e86a05ae7c76046319e8f326f2e85de1c505b1 (patch) | |
| tree | fbd7ba67c002e7d4b9546504968ed0c967b876d9 /src/rt/rust_upcall.cpp | |
| parent | Er, this would be the hunk that actually failed to get committed last time. (diff) | |
| download | rust-47e86a05ae7c76046319e8f326f2e85de1c505b1.tar.xz rust-47e86a05ae7c76046319e8f326f2e85de1c505b1.zip | |
Fix rust_vec constructor assertion failure caused by slow path of upcall_vec_grow. Add testcase.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index a3373870..6f12b24d 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -381,7 +381,7 @@ upcall_vec_grow(rust_task *task, rust_vec *v, size_t n_bytes, uintptr_t is_gc) LOG_UPCALL_ENTRY(task); rust_dom *dom = task->dom; task->log(rust_log::UPCALL|rust_log::MEM, - "upcall vec_grow(%" PRIxPTR ", %" PRIdPTR + "upcall vec_grow(0x%" PRIxPTR ", %" PRIdPTR "), alloc=%" PRIdPTR ", fill=%" PRIdPTR, v, n_bytes, v->alloc, v->fill); size_t alloc = next_power_of_two(sizeof(rust_vec) + v->fill + n_bytes); @@ -411,7 +411,8 @@ upcall_vec_grow(rust_task *task, rust_vec *v, size_t n_bytes, uintptr_t is_gc) return NULL; } v->deref(); - v = new (mem) rust_vec(dom, alloc, v->fill, &v->data[0]); + v = new (mem) rust_vec(dom, alloc, v->fill, + v->fill ? &v->data[0] : NULL); } I(dom, sizeof(rust_vec) + v->fill <= v->alloc); return v; |