mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-10 02:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some edge cases in the env param of spawn. (#4364)

Browse Source 
Close: #4362
This commit is contained in:
Ai Hoshino
2023-08-28 14:58:31 +08:00
committed by GitHub
parent ed5dc5bbf9
commit efe987e8d1
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bun.js/api/bun/subprocess.zig
View File

@@ -1041,6 +1041,7 @@ pub const Subprocess = struct {
var env: [*:null]?[*:0]const u8 = undefined;
var override_env = false;
var env_array = std.ArrayListUnmanaged(?[*:0]const u8){
.items = &.{},
.capacity = 0,
@@ -1168,6 +1169,7 @@ pub const Subprocess = struct {
return .zero;
}
override_env = true;
var object_iter = JSC.JSPropertyIterator(.{
.skip_empty_name = false,
.include_value = true,
@@ -1257,7 +1259,7 @@ pub const Subprocess = struct {
}
defer actions.deinit();
if (env_array.items.len == 0) {
if (!override_env and env_array.items.len == 0) {
env_array.items = jsc_vm.bundler.env.map.createNullDelimitedEnvMap(allocator) catch |err| return globalThis.handleError(err, "in posix_spawn");
env_array.capacity = env_array.items.len;
}
@@ -1302,13 +1304,11 @@ pub const Subprocess = struct {
return .zero;
};
if (env_array.items.len > 0) {
env_array.append(allocator, null) catch {
globalThis.throw("out of memory", .{});
return .zero;
};
env = @as(@TypeOf(env), @ptrCast(env_array.items.ptr));
}
env_array.append(allocator, null) catch {
globalThis.throw("out of memory", .{});
return .zero;
};
env = @as(@TypeOf(env), @ptrCast(env_array.items.ptr));
const pid = brk: {
defer {

23
test/js/node/child_process/child_process.test.ts
View File

@@ -149,13 +149,24 @@ describe("spawn()", () => {
});
it("should allow us to set env", async () => {
const child = spawn("env", { env: { TEST: "test" } });
const result: string = await new Promise(resolve => {
child.stdout.on("data", data => {
resolve(data.toString());
async function getChildEnv(env: any): Promise<string> {
const child = spawn("env", { env: env });
const result: string = await new Promise(resolve => {
let output = "";
child.stdout.on("data", data => {
output += data;
});
child.stdout.on("end", () => {
resolve(output);
});
});
});
expect(/TEST\=test/.test(result)).toBe(true);
return result;
}
expect(/TEST\=test/.test(await getChildEnv({ TEST: "test" }))).toBe(true);
expect(await getChildEnv({})).toStrictEqual("");
expect(await getChildEnv(undefined)).not.toStrictEqual("");
expect(await getChildEnv(null)).not.toStrictEqual("");
});
it("should allow explicit setting of argv0", async () => {