archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 02:24:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.Io.net: don't swallow 'error.Canceled'

Browse source 
This was missed when updating to the new group cancelation API, and
caused illegal behavior in many cases (the condition was simply that a
DNS query returned a second result before a connection was successfully
established).
This commit is contained in:
Matthew Lugg 2025-12-31 13:11:05 +00:00
parent f306a9f84a
commit 3bb2f7b84e
No known key found for this signature in database
GPG key ID: 3F5B7DCCBF4AF02E
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/std/Io/net/HostName.zig
View file

@ -233,11 +233,12 @@ pub fn connect(
if (result) |stream| {
return stream;
} else |err| switch (err) {
error.Canceled => unreachable,
error.SystemResources,
error.OptionUnsupported,
error.ProcessFdQuotaExceeded,
error.SystemFdQuotaExceeded,
error.Canceled,
=> |e| return e,
error.WouldBlock => return error.Unexpected,
@ -259,6 +260,8 @@ pub fn connect(
/// Asynchronously establishes a connection to all IP addresses associated with
/// a host name, adding them to a results queue upon completion.
///
/// `error.Canceled` will never be added to the queue, but other errors may be.
///
/// Closes `results` before return, even on error.
///
/// Asserts `results` is not closed until this call returns.
@ -299,22 +302,15 @@ fn enqueueConnection(
io: Io,
queue: *Io.Queue(IpAddress.ConnectError!Stream),
options: IpAddress.ConnectOptions,
) void {
enqueueConnectionFallible(address, io, queue, options) catch |err| switch (err) {
error.Canceled => {},
};
}
fn enqueueConnectionFallible(
address: IpAddress,
io: Io,
queue: *Io.Queue(IpAddress.ConnectError!Stream),
options: IpAddress.ConnectOptions,
) Io.Cancelable!void {
const result = address.connect(io, options);
const result = address.connect(io, options) catch |err| switch (err) {
error.Canceled => |e| return e,
else => |e| e, // other errors go in the result queue
};
errdefer if (result) |s| s.close(io) else |_| {};
queue.putOne(io, result) catch |err| switch (err) {
error.Closed => unreachable, // `queue` must not be closed
error.Canceled => |e| return e,
error.Closed => unreachable, // `queue` must not be closed
};
}