Do not assume that FILE_BOTH_DIR_INFORMATION is correctly aligned

salo-dea · Vexu · commit a58ecf7b090f · 2023-11-21T15:21:41.000+02:00
diff --git a/lib/std/fs.zig b/lib/std/fs.zig
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,9 @@ pub const IterableDir = struct {`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`
`752`		`- const dir_info: *w.FILE_BOTH_DIR_INFORMATION = @ptrCast(@alignCast(&self.buf[self.index]));`
	`752`	`+ // While the official api docs guarantee FILE_BOTH_DIR_INFORMATION to be aligned properly`
	`753`	`+ // this may not always be the case (e.g. due to faulty VM/Sandboxing tools)`
	`754`	`+ const dir_info: *align(2) w.FILE_BOTH_DIR_INFORMATION = @ptrCast(@alignCast(&self.buf[self.index]));`
`753`	`755`	`if (dir_info.NextEntryOffset != 0) {`
`754`	`756`	`self.index += dir_info.NextEntryOffset;`
`755`	`757`	`} else {`