mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-07-16 14:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal/search: don't clear storage when updating fingerprint (#13311)

Browse Source 
Using `clearRetainingCapacity` as it was being used in
Fingerprint.update produces undefined behavior; both the old "copy" and
current version of the fingerprint would still be using the same
storage.

This commit changes the function so that the storage is more clearly
re-used, and shrunk at the end if need be.
This commit is contained in:
Mitchell Hashimoto
2026-07-12 18:00:11 -07:00
committed by GitHub
parent a3ac713b77 bc8bb6c0f0
commit 89621a194c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/terminal/search/viewport.zig
View File

@@ -197,9 +197,8 @@ pub const ViewportSearch = struct {
pub fn update(self: *Fingerprint, alloc: Allocator, pages: *PageList) Allocator.Error!bool {
try self.entries.ensureTotalCapacity(alloc, pages.rows);
const old = self.entries.items;
const old_len = self.entries.items.len;
var changed = false;
self.entries.clearRetainingCapacity();
var i: usize = 0;
var it = pages.pageIterator(.right_down, .{ .viewport = .{} }, null);
@@ -209,15 +208,20 @@ pub const ViewportSearch = struct {
.serial = chunk.node.serial,
};
if (!changed) {
changed = i >= old.len or
old[i].node != entry.node or
old[i].serial != entry.serial;
changed = i >= old_len or
self.entries.items[i].node != entry.node or
self.entries.items[i].serial != entry.serial;
}
self.entries.appendAssumeCapacity(entry);
if (i < self.entries.items.len) {
self.entries.items[i] = entry;
} else {
self.entries.appendAssumeCapacity(entry);
}
}
return changed or i != old.len;
self.entries.shrinkRetainingCapacity(i);
return changed or i != old_len;
}
};
};