mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-21 14:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

child_process: collectOutputWindows handle broken_pipe from ReadFile

Browse Source 
This was found on a user's machine when calling "git" as a child process from msys.  Instead of getting BROKEN_PIPE on GetOverlappedREsult, it would occur on ReadFile which would then cause the function to hang because the async operation was never started.
This commit is contained in:
Jonathan Marler 2022-02-05 18:59:09 -07:00
parent adc9a282d8
commit 53d8a25dab
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/std/child_process.zig
View File

@ -277,10 +277,19 @@ pub const ChildProcess = struct {
const new_capacity = std.math.min(outs[i].items.len + bump_amt, max_output_bytes);
try outs[i].ensureTotalCapacity(new_capacity);
const buf = outs[i].unusedCapacitySlice();
_ = windows.kernel32.ReadFile(handles[i], buf.ptr, math.cast(u32, buf.len) catch maxInt(u32), null, &overlapped[i]);
wait_objects[wait_object_count] = handles[i];
wait_object_count += 1;
const read_result = windows.kernel32.ReadFile(handles[i], buf.ptr, math.cast(u32, buf.len) catch maxInt(u32), null, &overlapped[i]);
std.debug.assert(read_result == 0);
switch (windows.kernel32.GetLastError()) {
.IO_PENDING => {
wait_objects[wait_object_count] = handles[i];
wait_object_count += 1;
},
.BROKEN_PIPE => {}, // don't add to the wait_objects list
else => |err| return windows.unexpectedError(err),
}
}
if (wait_object_count == 0)
return;
while (true) {
const status = windows.kernel32.WaitForMultipleObjects(wait_object_count, &wait_objects, 0, windows.INFINITE);
@ -320,9 +329,16 @@ pub const ChildProcess = struct {
try outs[i].ensureTotalCapacity(new_capacity);
const buf = outs[i].unusedCapacitySlice();
if (buf.len == 0) return if (i == 0) error.StdoutStreamTooLong else error.StderrStreamTooLong;
_ = windows.kernel32.ReadFile(handles[i], buf.ptr, math.cast(u32, buf.len) catch maxInt(u32), null, &overlapped[i]);
wait_objects[wait_object_count] = handles[i];
wait_object_count += 1;
const read_result = windows.kernel32.ReadFile(handles[i], buf.ptr, math.cast(u32, buf.len) catch maxInt(u32), null, &overlapped[i]);
std.debug.assert(read_result == 0);
switch (windows.kernel32.GetLastError()) {
.IO_PENDING => {
wait_objects[wait_object_count] = handles[i];
wait_object_count += 1;
},
.BROKEN_PIPE => {}, // don't add to the wait_objects list
else => |err| return windows.unexpectedError(err),
}
}
}