mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.net: fix parsing IPv6 addr "::"

Browse source
This commit is contained in:
Andrew Kelley 2025-09-22 17:32:38 -07:00
parent 885b3f8342
commit 5782158628
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/std/Io/net.zig
View file

@ -276,9 +276,9 @@ pub const Ip6Address = struct {
if (text[text_i] != ':') return .{ .invalid_byte = text_i }; if (text[text_i] != ':') return .{ .invalid_byte = text_i };
assert(parts_i == 0); assert(parts_i == 0);
} }
text_i += 1;
if (text.len - text_i == 0) return .unexpected_end;
compress_start = parts_i; compress_start = parts_i;
text_i += 1;
if (text.len - text_i == 0) continue :state .end;
continue :c text[text_i]; continue :c text[text_i];
} else { } else {
parts_i += 1; parts_i += 1;
@ -744,19 +744,30 @@ pub const Server = struct {
test "parsing IPv6 addresses" { test "parsing IPv6 addresses" {
try testIp6Parse("fe80::e0e:76ff:fed4:cf22%eno1"); try testIp6Parse("fe80::e0e:76ff:fed4:cf22%eno1");
try testIp6Parse("2001:db8::1"); try testIp6Parse("2001:db8::1");
try testIp6ParseTransform("2001:db8::1", "2001:0db8:0000:0000:0000:0000:0000:0001");
try testIp6Parse("::1");
try testIp6Parse("::");
try testIp6Parse("fe80::1");
try testIp6Parse("fe80::abcd:ef12%3");
try testIp6Parse("ff02::");
try testIp6Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
} }
fn testIp6Parse(text: []const u8) !void { fn testIp6Parse(input: []const u8) !void {
const ua = switch (Ip6Address.Unresolved.parse(text)) { return testIp6ParseTransform(input, input);
}
fn testIp6ParseTransform(expected: []const u8, input: []const u8) !void {
const ua = switch (Ip6Address.Unresolved.parse(input)) {
.success => |p| p, .success => |p| p,
else => |x| { else => |x| {
std.debug.print("failed to parse \"{s}\": {any}\n", .{ text, x }); std.debug.print("failed to parse \"{s}\": {any}\n", .{ input, x });
return error.TestFailed; return error.TestFailed;
}, },
}; };
var buffer: [100]u8 = undefined; var buffer: [100]u8 = undefined;
const result = try std.fmt.bufPrint(&buffer, "{f}", .{ua}); const result = try std.fmt.bufPrint(&buffer, "{f}", .{ua});
try std.testing.expectEqualStrings(text, result); try std.testing.expectEqualStrings(expected, result);
} }
test { test {