neurocyte/nightwatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: misc review findings

Browse source
This commit is contained in:
CJ van den Berg 2026-02-26 13:36:14 +01:00
parent 07fcb900f8
commit cf4ce5923a
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/nightwatch.zig
View file

@ -333,7 +333,7 @@ const FSEventsBackend = struct {
self.watches.deinit(allocator); self.watches.deinit(allocator);
} }
fn arm(self: *@This(), allocator: std.mem.Allocator) error{OutOfMemory}!void { fn arm(self: *@This(), allocator: std.mem.Allocator) error{ OutOfMemory, ArmFailed }!void {
if (self.stream != null) return; if (self.stream != null) return;
var cf_strings: std.ArrayListUnmanaged(?*anyopaque) = .empty; var cf_strings: std.ArrayListUnmanaged(?*anyopaque) = .empty;
@ -361,7 +361,7 @@ const FSEventsBackend = struct {
cf_strings.items.ptr, cf_strings.items.ptr,
@intCast(cf_strings.items.len), @intCast(cf_strings.items.len),
null, null,
) orelse return; ) orelse return error.ArmFailed;
defer cf.CFRelease(paths_array); defer cf.CFRelease(paths_array);
const ctx = try allocator.create(CallbackContext); const ctx = try allocator.create(CallbackContext);
@ -376,7 +376,7 @@ const FSEventsBackend = struct {
kFSEventStreamEventIdSinceNow, kFSEventStreamEventIdSinceNow,
0.1, 0.1,
kFSEventStreamCreateFlagNoDefer | kFSEventStreamCreateFlagFileEvents, kFSEventStreamCreateFlagNoDefer | kFSEventStreamCreateFlagFileEvents,
) orelse return; ) orelse return error.ArmFailed;
errdefer cf.FSEventStreamRelease(stream); errdefer cf.FSEventStreamRelease(stream);
const queue = cf.dispatch_queue_create("flow.file_watcher", null); const queue = cf.dispatch_queue_create("flow.file_watcher", null);
@ -493,6 +493,7 @@ const KQueueBackend = struct {
self.watches.deinit(allocator); self.watches.deinit(allocator);
var sit = self.snapshots.iterator(); var sit = self.snapshots.iterator();
while (sit.next()) |entry| { while (sit.next()) |entry| {
allocator.free(entry.key_ptr.*);
var names = entry.value_ptr.*; var names = entry.value_ptr.*;
var nit = names.iterator(); var nit = names.iterator();
while (nit.next()) |ne| allocator.free(ne.key_ptr.*); while (nit.next()) |ne| allocator.free(ne.key_ptr.*);
@ -705,6 +706,7 @@ const WindowsBackend = struct {
pub extern "kernel32" fn GetFileAttributesW(lpFileName: [*:0]const windows.WCHAR) callconv(.winapi) windows.DWORD; pub extern "kernel32" fn GetFileAttributesW(lpFileName: [*:0]const windows.WCHAR) callconv(.winapi) windows.DWORD;
}; };
handler: *Handler,
iocp: windows.HANDLE, iocp: windows.HANDLE,
thread: ?std.Thread, thread: ?std.Thread,
watches: std.StringHashMapUnmanaged(Watch), watches: std.StringHashMapUnmanaged(Watch),
@ -743,9 +745,9 @@ const WindowsBackend = struct {
0x00000010 | // FILE_NOTIFY_CHANGE_LAST_WRITE 0x00000010 | // FILE_NOTIFY_CHANGE_LAST_WRITE
0x00000040; // FILE_NOTIFY_CHANGE_CREATION 0x00000040; // FILE_NOTIFY_CHANGE_CREATION
fn init() windows.CreateIoCompletionPortError!@This() { fn init(handler: *Handler) windows.CreateIoCompletionPortError!@This() {
const iocp = try windows.CreateIoCompletionPort(windows.INVALID_HANDLE_VALUE, null, 0, 1); const iocp = try windows.CreateIoCompletionPort(windows.INVALID_HANDLE_VALUE, null, 0, 1);
return .{ .iocp = iocp, .thread = null, .watches = .empty, .watches_mutex = .{} }; return .{ .handler = handler, .iocp = iocp, .thread = null, .watches = .empty, .watches_mutex = .{} };
} }
fn deinit(self: *@This(), allocator: std.mem.Allocator) void { fn deinit(self: *@This(), allocator: std.mem.Allocator) void {
@ -828,14 +830,18 @@ const WindowsBackend = struct {
offset += info.NextEntryOffset; offset += info.NextEntryOffset;
continue; continue;
} else event_type; } else event_type;
// Capture next_entry_offset before releasing the mutex: after unlock,
// the main thread may call remove_watch() which frees w.buf, making
// the `info` pointer (which points into w.buf) a dangling reference.
const next_entry_offset = info.NextEntryOffset;
watches_mutex.unlock(); watches_mutex.unlock();
handler.change(full_path, adjusted_event_type) catch { handler.change(full_path, adjusted_event_type) catch {
watches_mutex.lock(); watches_mutex.lock();
break; break;
}; };
watches_mutex.lock(); watches_mutex.lock();
if (info.NextEntryOffset == 0) break; if (next_entry_offset == 0) break;
offset += info.NextEntryOffset; offset += next_entry_offset;
} }
} }
// Re-arm ReadDirectoryChangesW for the next batch. // Re-arm ReadDirectoryChangesW for the next batch.