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

std.Io.net.HostName: fix DNS resolution

Browse Source 
* merge conflict with changing behavior of takeDelimiterExclusive
* check bounds before adding to result array
This commit is contained in:
Andrew Kelley 2025-10-13 18:06:44 -07:00
parent 923a7bdd7e
commit d3f0c460ec
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/std/Io/net/HostName.zig
View File

@ -396,20 +396,24 @@ fn lookupDns(io: Io, lookup_canon_name: []const u8, rc: *const ResolvConf, optio
std.posix.RR.A => {
const data = record.packet[record.data_off..][0..record.data_len];
if (data.len != 4) return error.InvalidDnsARecord;
options.addresses_buffer[addresses_len] = .{ .ip4 = .{
.bytes = data[0..4].*,
.port = options.port,
} };
addresses_len += 1;
if (addresses_len < options.addresses_buffer.len) {
options.addresses_buffer[addresses_len] = .{ .ip4 = .{
.bytes = data[0..4].*,
.port = options.port,
} };
addresses_len += 1;
}
},
std.posix.RR.AAAA => {
const data = record.packet[record.data_off..][0..record.data_len];
if (data.len != 16) return error.InvalidDnsAAAARecord;
options.addresses_buffer[addresses_len] = .{ .ip6 = .{
.bytes = data[0..16].*,
.port = options.port,
} };
addresses_len += 1;
if (addresses_len < options.addresses_buffer.len) {
options.addresses_buffer[addresses_len] = .{ .ip6 = .{
.bytes = data[0..16].*,
.port = options.port,
} };
addresses_len += 1;
}
},
std.posix.RR.CNAME => {
_, canonical_name = expand(record.packet, record.data_off, options.canonical_name_buffer) catch
@ -472,6 +476,7 @@ fn lookupHostsReader(host_name: HostName, options: LookupOptions, reader: *Io.Re
error.ReadFailed => return error.ReadFailed,
error.EndOfStream => break,
};
reader.toss(1);
var split_it = std.mem.splitScalar(u8, line, '#');
const no_comment_line = split_it.first();