Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pointer alignment fixes for the stdlib

Browse Source
This commit is contained in:
LemonBoy 2019-12-20 13:58:19 +01:00
parent e134e6c994
commit 7fe13f4a86
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/debug.zig
View File

@ -1084,7 +1084,7 @@ fn openSelfDebugInfoMacOs(allocator: *mem.Allocator) !DebugInfo {
std.macho.LC_SYMTAB => break @ptrCast(*std.macho.symtab_command, ptr), std.macho.LC_SYMTAB => break @ptrCast(*std.macho.symtab_command, ptr),
else => {}, else => {},
} }
ptr += lc.cmdsize; // TODO https://github.com/ziglang/zig/issues/1403 ptr = @alignCast(@alignOf(std.macho.load_command), ptr + lc.cmdsize);
} else { } else {
return error.MissingDebugInfo; return error.MissingDebugInfo;
}; };
@ -2129,7 +2129,7 @@ fn getLineNumberInfoMacOs(di: *DebugInfo, symbol: MachoSymbol, target_address: u
std.macho.LC_SEGMENT_64 => break @ptrCast(*const std.macho.segment_command_64, @alignCast(@alignOf(std.macho.segment_command_64), ptr)), std.macho.LC_SEGMENT_64 => break @ptrCast(*const std.macho.segment_command_64, @alignCast(@alignOf(std.macho.segment_command_64), ptr)),
else => {}, else => {},
} }
ptr += lc.cmdsize; // TODO https://github.com/ziglang/zig/issues/1403 ptr = @alignCast(@alignOf(std.macho.load_command), ptr + lc.cmdsize);
} else { } else {
return error.MissingDebugInfo; return error.MissingDebugInfo;
}; };

4
lib/std/event/fs.zig
View File

@ -1263,7 +1263,7 @@ pub fn Watch(comptime V: type) type {
var ptr = event_buf[0..].ptr; var ptr = event_buf[0..].ptr;
const end_ptr = ptr + event_buf.len; const end_ptr = ptr + event_buf.len;
var ev: *os.linux.inotify_event = undefined; var ev: *os.linux.inotify_event = undefined;
while (@ptrToInt(ptr) < @ptrToInt(end_ptr)) : (ptr += @sizeOf(os.linux.inotify_event) + ev.len) { while (@ptrToInt(ptr) < @ptrToInt(end_ptr)) {
ev = @ptrCast(*os.linux.inotify_event, ptr); ev = @ptrCast(*os.linux.inotify_event, ptr);
if (ev.mask & os.linux.IN_CLOSE_WRITE == os.linux.IN_CLOSE_WRITE) { if (ev.mask & os.linux.IN_CLOSE_WRITE == os.linux.IN_CLOSE_WRITE) {
const basename_ptr = ptr + @sizeOf(os.linux.inotify_event); const basename_ptr = ptr + @sizeOf(os.linux.inotify_event);
@ -1287,6 +1287,8 @@ pub fn Watch(comptime V: type) type {
}); });
} }
} }
ptr = @alignCast(@alignOf(os.linux.inotify_event), ptr + @sizeOf(os.linux.inotify_event) + ev.len);
} }
}, },
os.linux.EINTR => continue, os.linux.EINTR => continue,