---

yaml
---
r: 13143
b: refs/heads/master
c: b16bdd9
h: refs/heads/master
i:
  13141: 64a7e2a
  13139: caaaadc
  13135: f77ceff
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a2bbdd3f52a71beabc1beb964772d30045cbe949
+refs/heads/master: b16bdd9ed097ea91a71f3bbffbad4c5e7d57722e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_upcall.cpp

@@ -164,14 +164,16 @@ exchange_malloc(rust_task *task, type_desc *td, uintptr_t size) {
     size_t header_size = sizeof(rust_opaque_box);
     size_t body_size = size;
     size_t body_align = td->align;
+    // FIXME: This alignment calculation is suspicious. Is it right?
     size_t total_size = align_to(header_size, body_align) + body_size;
 
     void *p = task->kernel->malloc(total_size, "exchange malloc");
-    memset(p, '\0', total_size);
 
     rust_opaque_box *header = static_cast<rust_opaque_box*>(p);
     header->td = td;
 
+    memset(&header[1], '\0', body_size);
+
     return (uintptr_t)header;
 }