---

yaml
---
r: 4007
b: refs/heads/master
c: 652214d
h: refs/heads/master
i:
  4005: 1cca5d4
  4003: a5d9f0a
  3999: 63cf1dc
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19a17b3d1d0d25155c8bd11c73bf88238f9bd180
+refs/heads/master: 652214d7f90516fd77394fddd65cda69d8861e58

trunk/src/rt/rust_builtin.cpp

@@ -608,8 +608,12 @@ rust_list_files_ivec(rust_task *task, rust_str *path) {
       closedir(dirp);
   }
 #endif
+  size_t str_ivec_sz =
+      sizeof(size_t)            // fill
+      + sizeof(size_t)          // alloc
+      + sizeof(rust_str *) * 4; // payload
   rust_box *box = (rust_box *)task->malloc(sizeof(rust_box) +
-                                           sizeof(rust_ivec));
+                                           str_ivec_sz);
   box->ref_count = 1;
   rust_ivec *iv = (rust_ivec *)&box->data;
   iv->fill = 0;

trunk/src/rt/rust_util.h

@@ -202,6 +202,7 @@ rust_ivec_heap
     uint8_t data[];
 };
 
+// Note that the payload is actually size 4*sizeof(elem), even when heapified
 union
 rust_ivec_payload
 {

trunk/src/test/run-pass/lib-fs.rs

@@ -9,4 +9,12 @@ fn test_connect() {
     assert (fs::connect("a" + slash, "b") == "a" + slash + "b");
 }
 
-fn main() { test_connect(); }
+// Issue #712
+fn test_list_dir_no_invalid_memory_access() {
+  fs::list_dir(".");
+}
+
+fn main() {
+  test_connect();
+  test_list_dir_no_invalid_memory_access();
+}