diff --git a/lib/std/child_process.zig b/lib/std/child_process.zig index 123e0e266e..7458e4f6ba 100644 --- a/lib/std/child_process.zig +++ b/lib/std/child_process.zig @@ -390,15 +390,8 @@ pub const ChildProcess = struct { // can fail between fork() and execve(). // Therefore, we do all the allocation for the execve() before the fork(). // This means we must do the null-termination of argv and env vars here. - const argv_buf = try arena.alloc(?[*:0]u8, self.argv.len + 1); - for (self.argv) |arg, i| { - const arg_buf = try arena.alloc(u8, arg.len + 1); - @memcpy(arg_buf.ptr, arg.ptr, arg.len); - arg_buf[arg.len] = 0; - argv_buf[i] = arg_buf[0..arg.len :0].ptr; - } - argv_buf[self.argv.len] = null; - const argv_ptr = argv_buf[0..self.argv.len :null].ptr; + const argv_buf = try arena.allocSentinel(?[*:0]u8, self.argv.len, null); + for (self.argv) |arg, i| argv_buf[i] = (try arena.dupeZ(u8, arg)).ptr; const envp = m: { if (self.env_map) |env_map| { @@ -465,8 +458,8 @@ pub const ChildProcess = struct { } const err = switch (self.expand_arg0) { - .expand => os.execvpeZ_expandArg0(.expand, argv_buf.ptr[0].?, argv_ptr, envp), - .no_expand => os.execvpeZ_expandArg0(.no_expand, argv_buf.ptr[0].?, argv_ptr, envp), + .expand => os.execvpeZ_expandArg0(.expand, argv_buf.ptr[0].?, argv_buf.ptr, envp), + .no_expand => os.execvpeZ_expandArg0(.no_expand, argv_buf.ptr[0].?, argv_buf.ptr, envp), }; forkChildErrReport(err_pipe[1], err); } @@ -913,23 +906,20 @@ pub fn createWindowsEnvBlock(allocator: *mem.Allocator, env_map: *const BufMap) pub fn createNullDelimitedEnvMap(arena: *mem.Allocator, env_map: *const std.BufMap) ![:null]?[*:0]u8 { const envp_count = env_map.count(); - const envp_buf = try arena.alloc(?[*:0]u8, envp_count + 1); - mem.set(?[*:0]u8, envp_buf, null); + const envp_buf = try arena.allocSentinel(?[*:0]u8, envp_count, null); { var it = env_map.iterator(); var i: usize = 0; while (it.next()) |pair| : (i += 1) { - const env_buf = try arena.alloc(u8, pair.key.len + pair.value.len + 2); - @memcpy(env_buf.ptr, pair.key.ptr, pair.key.len); + const env_buf = try arena.allocSentinel(u8, pair.key.len + pair.value.len + 1, 0); + mem.copy(u8, env_buf, pair.key); env_buf[pair.key.len] = '='; - @memcpy(env_buf.ptr + pair.key.len + 1, pair.value.ptr, pair.value.len); - const len = env_buf.len - 1; - env_buf[len] = 0; - envp_buf[i] = env_buf[0..len :0].ptr; + mem.copy(u8, env_buf[pair.key.len + 1 ..], pair.value); + envp_buf[i] = env_buf.ptr; } assert(i == envp_count); } - return envp_buf[0..envp_count :null]; + return envp_buf; } test "createNullDelimitedEnvMap" { diff --git a/lib/std/process.zig b/lib/std/process.zig index 909b337f89..275c8bc77b 100644 --- a/lib/std/process.zig +++ b/lib/std/process.zig @@ -816,15 +816,8 @@ pub fn execve( defer arena_allocator.deinit(); const arena = &arena_allocator.allocator; - const argv_buf = try arena.alloc(?[*:0]u8, argv.len + 1); - for (argv) |arg, i| { - const arg_buf = try arena.alloc(u8, arg.len + 1); - @memcpy(arg_buf.ptr, arg.ptr, arg.len); - arg_buf[arg.len] = 0; - argv_buf[i] = arg_buf[0..arg.len :0].ptr; - } - argv_buf[argv.len] = null; - const argv_ptr = argv_buf[0..argv.len :null].ptr; + const argv_buf = try arena.allocSentinel(?[*:0]u8, argv.len, null); + for (argv) |arg, i| argv_buf[i] = (try arena.dupeZ(u8, arg)).ptr; const envp = m: { if (env_map) |m| { @@ -842,5 +835,5 @@ pub fn execve( } }; - return os.execvpeZ_expandArg0(.no_expand, argv_buf.ptr[0].?, argv_ptr, envp); + return os.execvpeZ_expandArg0(.no_expand, argv_buf.ptr[0].?, argv_buf.ptr, envp); }