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

fix: crash on long buffer name in filestate widget

Browse source 
And in project state restore.

closes #478
This commit is contained in:
CJ van den Berg 2026-02-01 20:58:26 +01:00
parent 0251d783bf
commit e4ce2fb8e3
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Project.zig
View file

@ -218,7 +218,7 @@ pub fn restore_state_v1(self: *Self, data: []const u8) !void {
tp.trace(tp.channel.debug, .{ "restore_state_v1", "file", path_, mtime, row, col });
const path = project_manager.normalize_file_path_dot_prefix(path_);
self.longest_file_path = @max(self.longest_file_path, path.len);
const stat = std.fs.cwd().statFile(path) catch |e| switch (e) {
const stat = std.fs.cwd().statFile(path[0..@min(path.len, std.fs.max_name_bytes)]) catch |e| switch (e) {
error.FileNotFound => continue,
else => {
try self.update_mru_internal(path, mtime, row, col);
@ -289,7 +289,7 @@ pub fn restore_state_v0(self: *Self, data: []const u8) error{
tp.trace(tp.channel.debug, .{ "restore_state_v0", "file", path_, mtime, row, col });
const path = project_manager.normalize_file_path_dot_prefix(path_);
self.longest_file_path = @max(self.longest_file_path, path.len);
const stat = std.fs.cwd().statFile(path) catch |e| switch (e) {
const stat = std.fs.cwd().statFile(path[0..@min(path.len, std.fs.max_name_bytes)]) catch |e| switch (e) {
error.FileNotFound => continue,
else => {
try self.update_mru_internal(path, mtime, row, col);

10
src/tui/status/filestate.zig
View file

@ -231,8 +231,9 @@ fn process_event(self: *Self, m: tp.message) error{Exit}!bool {
} else if (try m.match(.{ tp.any, "eol_mode", tp.extract(&self.eol_mode), tp.extract(&self.utf8_sanitized), tp.extract(&self.indent_mode) })) {
//
} else if (try m.match(.{ tp.any, "save", tp.extract(&file_path), tp.extract(&self.auto_save) })) {
@memcpy(self.name_buf[0..file_path.len], file_path);
self.name = self.name_buf[0..file_path.len];
const name_len = @min(file_path.len, self.name_buf.len);
@memcpy(self.name_buf[0..name_len], file_path[0..name_len]);
self.name = self.name_buf[0..name_len];
self.file_exists = true;
self.file_dirty = false;
self.name = project_manager.abbreviate_home(&self.name_buf, self.name);
@ -246,9 +247,10 @@ fn process_event(self: *Self, m: tp.message) error{Exit}!bool {
tp.extract(&self.file_color),
tp.extract(&self.auto_save),
})) {
const name_len = @min(file_path.len, self.name_buf.len);
self.eol_mode = .lf;
@memcpy(self.name_buf[0..file_path.len], file_path);
self.name = self.name_buf[0..file_path.len];
@memcpy(self.name_buf[0..name_len], file_path[0..name_len]);
self.name = self.name_buf[0..name_len];
@memcpy(self.file_type_buf[0..file_type.len], file_type);
self.file_type = self.file_type_buf[0..file_type.len];
@memcpy(self.file_icon_buf[0..file_icon.len], file_icon);