Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

std.fs.IterableDir.Iterator.next(): Do not assume that FILE_BOTH_DIR_INFORMATION is correctly aligned #17958

Merged
merged 2 commits into from
Nov 21, 2023
Merged

std.fs.IterableDir.Iterator.next(): Do not assume that FILE_BOTH_DIR_INFORMATION is correctly aligned #17958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e658d10
Do not assume that FILE_BOTH_DIR_INFORMATION is correctly aligned
salo-dea Nov 10, 2023
4c48f13
Merge branch 'master' into win-iterdir-alignment-panic
salo-dea Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/std/fs.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,9 @@ pub const IterableDir = struct {
}
}

const dir_info: *w.FILE_BOTH_DIR_INFORMATION = @ptrCast(@alignCast(&self.buf[self.index]));
// While the official api docs guarantee FILE_BOTH_DIR_INFORMATION to be aligned properly
// this may not always be the case (e.g. due to faulty VM/Sandboxing tools)
const dir_info: *align(2) w.FILE_BOTH_DIR_INFORMATION = @ptrCast(@alignCast(&self.buf[self.index]));
if (dir_info.NextEntryOffset != 0) {
self.index += dir_info.NextEntryOffset;
} else {
Expand Down