Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-25 05:06:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal: don't crash if cell claims to have grapheme but doesn't

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-12-14 21:19:23 -08:00
parent 4a3e2b35b9
commit c7a28fab20
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/terminal/Screen.zig
View File

@ -443,7 +443,13 @@ pub const Row = struct {
assert(cell.attrs.grapheme); assert(cell.attrs.grapheme);
const key = self.getId() + x + 1; const key = self.getId() + x + 1;
const data = self.screen.graphemes.get(key).?; const data: GraphemeData = self.screen.graphemes.get(key) orelse data: {
// This is probably a bug somewhere in our internal state,
// but we don't want to just hard crash so its easier to just
// have zero codepoints.
log.debug("cell with grapheme flag but no grapheme data", .{});
break :data .{ .zero = {} };
};
return .{ .data = data }; return .{ .data = data };
} }
}; };
@ -485,6 +491,8 @@ pub const CodepointIterator = struct {
pub fn next(self: *CodepointIterator) ?u21 { pub fn next(self: *CodepointIterator) ?u21 {
switch (self.data) { switch (self.data) {
.zero => return null,
.one => |v| { .one => |v| {
if (self.i >= 1) return null; if (self.i >= 1) return null;
self.i += 1; self.i += 1;
@ -629,6 +637,7 @@ pub const GraphemeData = union(enum) {
// []u21 is sizeof([4]u21) anyways so if we can store avoid small allocations // []u21 is sizeof([4]u21) anyways so if we can store avoid small allocations
// we prefer it. Grapheme clusters are almost always <= 4 codepoints. // we prefer it. Grapheme clusters are almost always <= 4 codepoints.
zero: void,
one: u21, one: u21,
two: [2]u21, two: [2]u21,
three: [3]u21, three: [3]u21,
@ -645,6 +654,7 @@ pub const GraphemeData = union(enum) {
/// Append the codepoint cp to the grapheme data. /// Append the codepoint cp to the grapheme data.
pub fn append(self: *GraphemeData, alloc: Allocator, cp: u21) !void { pub fn append(self: *GraphemeData, alloc: Allocator, cp: u21) !void {
switch (self.*) { switch (self.*) {
.zero => self.* = .{ .one = cp },
.one => |v| self.* = .{ .two = .{ v, cp } }, .one => |v| self.* = .{ .two = .{ v, cp } },
.two => |v| self.* = .{ .three = .{ v[0], v[1], cp } }, .two => |v| self.* = .{ .three = .{ v[0], v[1], cp } },
.three => |v| self.* = .{ .four = .{ v[0], v[1], v[2], cp } }, .three => |v| self.* = .{ .four = .{ v[0], v[1], v[2], cp } },