From 73854b1619a71c9f43b3fd621f35698a1224f8ed Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Wed, 20 Jan 2016 17:12:28 -0500 Subject: [PATCH] sys/unix/process.rs: Update comments in make_argv and make_envp The implementation changed in 33a2191d, but the comments did not change to match. --- src/libstd/sys/unix/process.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index bb9d37f93ab..4a91cece143 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -439,11 +439,9 @@ fn make_argv(prog: &CString, args: &[CString]) { let mut ptrs: Vec<*const libc::c_char> = Vec::with_capacity(args.len()+1); - // Convert the CStrings into an array of pointers. Note: the - // lifetime of the various CStrings involved is guaranteed to be - // larger than the lifetime of our invocation of cb, but this is - // technically unsafe as the callback could leak these pointers - // out of our scope. + // Convert the CStrings into an array of pointers. Also return the + // vector that owns the raw pointers, to ensure they live long + // enough. ptrs.push(prog.as_ptr()); ptrs.extend(args.iter().map(|tmp| tmp.as_ptr())); @@ -457,10 +455,9 @@ fn make_envp(env: Option<&HashMap>) -> (*const c_void, Vec>, Vec<*const libc::c_char>) { // On posixy systems we can pass a char** for envp, which is a - // null-terminated array of "k=v\0" strings. Since we must create - // these strings locally, yet expose a raw pointer to them, we - // create a temporary vector to own the CStrings that outlives the - // call to cb. + // null-terminated array of "k=v\0" strings. As with make_argv, we + // return two vectors that own the data to ensure that they live + // long enough. if let Some(env) = env { let mut tmps = Vec::with_capacity(env.len());