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

fix: never double free LSP init queue

Browse source
This commit is contained in:
CJ van den Berg 2025-03-25 09:49:46 +01:00
parent 44c55dd4f2
commit 739b2a776f
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/LSP.zig
View file

@ -126,7 +126,7 @@ const Process = struct {
next_id: i32 = 0, next_id: i32 = 0,
requests: std.StringHashMap(tp.pid), requests: std.StringHashMap(tp.pid),
state: enum { init, running } = .init, state: enum { init, running } = .init,
init_queue: std.ArrayListUnmanaged(struct { tp.pid, []const u8, []const u8, InitQueueType }) = .empty, init_queue: ?std.ArrayListUnmanaged(struct { tp.pid, []const u8, []const u8, InitQueueType }) = null,
const InitQueueType = enum { request, notify }; const InitQueueType = enum { request, notify };
@ -283,7 +283,11 @@ const Process = struct {
} }
fn append_init_queue(self: *Process, from: tp.pid_ref, method: []const u8, bytes: []const u8, type_: InitQueueType) !void { fn append_init_queue(self: *Process, from: tp.pid_ref, method: []const u8, bytes: []const u8, type_: InitQueueType) !void {
const p = try self.init_queue.addOne(self.allocator); const queue = if (self.init_queue) |*queue| queue else blk: {
self.init_queue = .empty;
break :blk &self.init_queue.?;
};
const p = try queue.addOne(self.allocator);
p.* = .{ p.* = .{
from.clone(), from.clone(),
try self.allocator.dupe(u8, method), try self.allocator.dupe(u8, method),
@ -294,20 +298,25 @@ const Process = struct {
fn replay_init_queue(self: *Process) !void { fn replay_init_queue(self: *Process) !void {
defer self.free_init_queue(); defer self.free_init_queue();
for (self.init_queue.items) |*p| if (self.init_queue) |*queue| {
switch (p[3]) { for (queue.items) |*p|
.request => try self.send_request(p[0].ref(), p[1], p[2]), switch (p[3]) {
.notify => try self.send_notification(p[1], p[2]), .request => try self.send_request(p[0].ref(), p[1], p[2]),
}; .notify => try self.send_notification(p[1], p[2]),
};
}
} }
fn free_init_queue(self: *Process) void { fn free_init_queue(self: *Process) void {
for (self.init_queue.items) |*p| { if (self.init_queue) |*queue| {
p[0].deinit(); for (queue.items) |*p| {
self.allocator.free(p[1]); p[0].deinit();
self.allocator.free(p[2]); self.allocator.free(p[1]);
self.allocator.free(p[2]);
}
queue.deinit(self.allocator);
} }
self.init_queue.deinit(self.allocator); self.init_queue = null;
} }
fn receive_lsp_message(self: *Process, cb: []const u8) Error!void { fn receive_lsp_message(self: *Process, cb: []const u8) Error!void {