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

terminal: add integrity check for unmarked grapheme cell

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-09-05 14:16:35 -07:00
parent a3aa5463a1
commit f0149722e6
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/terminal/page.zig
View File

@ -289,6 +289,7 @@ pub const Page = struct {
UnmarkedGraphemeRow, UnmarkedGraphemeRow,
MissingGraphemeData, MissingGraphemeData,
InvalidGraphemeCount, InvalidGraphemeCount,
UnmarkedGraphemeCell,
MissingStyle, MissingStyle,
UnmarkedStyleRow, UnmarkedStyleRow,
MismatchedStyleRef, MismatchedStyleRef,
@ -368,6 +369,8 @@ pub const Page = struct {
var hyperlinks_seen = std.AutoHashMap(hyperlink.Id, usize).init(alloc); var hyperlinks_seen = std.AutoHashMap(hyperlink.Id, usize).init(alloc);
defer hyperlinks_seen.deinit(); defer hyperlinks_seen.deinit();
const grapheme_count = self.graphemeCount();
const rows = self.rows.ptr(self.memory)[0..self.size.rows]; const rows = self.rows.ptr(self.memory)[0..self.size.rows];
for (rows, 0..) |*row, y| { for (rows, 0..) |*row, y| {
const graphemes_start = graphemes_seen; const graphemes_start = graphemes_seen;
@ -385,6 +388,17 @@ pub const Page = struct {
}; };
graphemes_seen += 1; graphemes_seen += 1;
} else if (grapheme_count > 0) {
// It should not have grapheme data if it isn't marked.
// The grapheme_count check above is just an optimization
// to speed up integrity checks.
if (self.lookupGrapheme(cell) != null) {
log.warn(
"page integrity violation y={} x={} cell not marked as grapheme",
.{ y, x },
);
return IntegrityError.UnmarkedGraphemeCell;
}
} }
if (cell.style_id != style.default_id) { if (cell.style_id != style.default_id) {