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

pipe.signal.ptr == subprocess.stdin, not subprocess

Browse Source
This commit is contained in:
Jarred Sumner
2024-03-30 22:10:26 -07:00
parent 62c8c97e24
commit 4bbcc39d2f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1248,6 +1248,17 @@ pub const Subprocess = struct {
}
}
fn clearSignal(this: *Writable, subprocess: *const Subprocess, signal: *JSC.WebCore.Signal) void {
if (@intFromPtr(signal.ptr) == @intFromPtr(this)) {
signal.clear();
}
if (comptime Environment.allow_assert) {
// signal should only be assigned to the Writable
// not the Subprocess
std.debug.assert(signal.ptr != @as(*anyopaque, @ptrCast(@constCast(subprocess))));
}
}
pub fn toJS(this: *Writable, globalThis: *JSC.JSGlobalObject, subprocess: *Subprocess) JSValue {
return switch (this.*) {
.fd => |fd| fd.toJS(globalThis),
@@ -1261,9 +1272,9 @@ pub const Subprocess = struct {
} else {
subprocess.flags.has_stdin_destructor_called = false;
subprocess.weak_file_sink_stdin_ptr = pipe;
if (@intFromPtr(pipe.signal.ptr) == @intFromPtr(subprocess)) {
pipe.signal.clear();
}
clearSignal(this, subprocess, &pipe.signal);
return pipe.toJSWithDestructor(
globalThis,
JSC.WebCore.SinkDestructor.Ptr.init(subprocess),
@@ -1283,9 +1294,7 @@ pub const Subprocess = struct {
return switch (this.*) {
.pipe => |pipe| {
if (pipe.signal.ptr == @as(*anyopaque, @ptrCast(this))) {
pipe.signal.clear();
}
clearSignal(this, subprocess, &pipe.signal);
pipe.deref();