---

yaml
---
r: 3992
b: refs/heads/master
c: fb9a117
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0ab57b3f62017c065c6f3ced67e4c35898b51a3
+refs/heads/master: fb9a117743636ac41cf494dde6198c955270a67e

trunk/src/lib/run_program.rs

@@ -14,9 +14,10 @@ fn arg_vec(str prog, vec[str] args) -> vec[sbuf] {
 }
 
 fn run_program(str prog, vec[str] args) -> int {
-    auto pid =
-        rustrt::rust_run_program(vec::buf[sbuf](arg_vec(prog, args)), 0, 0,
-                                 0);
+    // Note: we have to hold on to this vector reference while we hold a
+    // pointer to its buffer
+    auto argv = arg_vec(prog, args);
+    auto pid = rustrt::rust_run_program(vec::buf(argv), 0, 0, 0);
     ret os::waitpid(pid);
 }
 
@@ -32,8 +33,11 @@ type program =
 fn start_program(str prog, vec[str] args) -> @program {
     auto pipe_input = os::pipe();
     auto pipe_output = os::pipe();
+    // Note: we have to hold on to this vector reference while we hold a
+    // pointer to its buffer
+    auto argv = arg_vec(prog, args);
     auto pid =
-        rustrt::rust_run_program(vec::buf[sbuf](arg_vec(prog, args)),
+        rustrt::rust_run_program(vec::buf(argv),
                                  pipe_input._0, pipe_output._1, 0);
     if (pid == -1) { fail; }
     os::libc::close(pipe_input._0);

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

@@ -0,0 +1,15 @@
+// xfail-stage0
+
+use std;
+import std::run;
+
+// Regression test for memory leaks
+fn test_leaks() {
+  run::run_program("echo", []);
+  run::start_program("echo", []);
+  run::program_output("echo", []);
+}
+
+fn main() {
+  test_leaks();
+}