mirror of
https://codeberg.org/ziglang/zig.git
synced 2026-04-28 03:17:08 +03:00
std.Io.Threaded: correctly initialize PosixAddress/WsaAddress from sockaddr (#30722)
Resolves ziglang/zig#30672 - UB caused by `std.Io.Threaded.netLookupFallible` incorrectly initializing `PosixAddress`/`WsaAddress` from `*sockaddr`. Reviewed-on: https://codeberg.org/ziglang/zig/pulls/30722 Co-authored-by: moriazoso <greysonmurray.dev@gmail.com> Co-committed-by: moriazoso <greysonmurray.dev@gmail.com>
This commit is contained in:
@@ -11997,8 +11997,7 @@ fn netLookupFallible(
|
||||
var canon_name: ?[*:0]const u16 = null;
|
||||
while (it) |info| : (it = info.next) {
|
||||
const addr = info.addr orelse continue;
|
||||
const storage: WsaAddress = .{ .any = addr.* };
|
||||
try resolved.putOne(t_io, .{ .address = addressFromWsa(&storage) });
|
||||
try resolved.putOne(t_io, .{ .address = addressFromWsa(@alignCast(@fieldParentPtr("any", addr))) });
|
||||
|
||||
if (info.canonname) |n| {
|
||||
if (canon_name == null) {
|
||||
@@ -12153,8 +12152,7 @@ fn netLookupFallible(
|
||||
var canon_name: ?[*:0]const u8 = null;
|
||||
while (it) |info| : (it = info.next) {
|
||||
const addr = info.addr orelse continue;
|
||||
const storage: PosixAddress = .{ .any = addr.* };
|
||||
try resolved.putOne(t_io, .{ .address = addressFromPosix(&storage) });
|
||||
try resolved.putOne(t_io, .{ .address = addressFromPosix(@alignCast(@fieldParentPtr("any", addr))) });
|
||||
|
||||
if (info.canonname) |n| {
|
||||
if (canon_name == null) {
|
||||
|
||||
Reference in New Issue
Block a user