mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-19 23:14:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when rendering a cell with a large number of combining chars

Browse Source 
Caused by kitty now supporting larger number of combining chars per
cell. Fixes #8318
This commit is contained in:
Kovid Goyal
2025-02-12 08:23:46 +05:30
parent fb54f1527f
commit e7a40300d1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kitty/fonts.c
View File

@@ -662,13 +662,13 @@ load_fallback_font(FontGroup *fg, const ListOfChars *lc, bool bold, bool italic,
return ans; return ans;
} }
size_t static size_t
chars_as_utf8(const ListOfChars *lc, char *buf, char_type zero_char) { chars_as_utf8(const ListOfChars *lc, char *buf, size_t bufsz, char_type zero_char) {
size_t n; size_t n;
if (lc->count == 1) n = encode_utf8(lc->chars[0] ? lc->chars[0] : zero_char, buf); if (lc->count == 1) n = encode_utf8(lc->chars[0] ? lc->chars[0] : zero_char, buf);
else { else {
n = encode_utf8(lc->chars[0], buf); n = encode_utf8(lc->chars[0], buf);
if (lc->chars[0] != '\t') for (unsigned i = 1; i < lc->count; i++) n += encode_utf8(lc->chars[i], buf + n); if (lc->chars[0] != '\t') for (unsigned i = 1; i < lc->count && n < bufsz - 4; i++) n += encode_utf8(lc->chars[i], buf + n);
} }
buf[n] = 0; buf[n] = 0;
return n; return n;
@@ -682,7 +682,7 @@ fallback_font(FontGroup *fg, const CPUCell *cpu_cell, const GPUCell *gpu_cell, c
char style = emoji_presentation ? 'a' : 'A'; char style = emoji_presentation ? 'a' : 'A';
if (bold) style += italic ? 3 : 2; else style += italic ? 1 : 0; if (bold) style += italic ? 3 : 2; else style += italic ? 1 : 0;
char cell_text[4 * 32] = {style}; char cell_text[4 * 32] = {style};
const size_t cell_text_len = 1 + chars_as_utf8(lc, cell_text + 1, ' '); const size_t cell_text_len = 1 + chars_as_utf8(lc, cell_text + 1, arraysz(cell_text) - 1, ' ');
fallback_font_map_t_itr fi = vt_get(&fg->fallback_font_map, cell_text); fallback_font_map_t_itr fi = vt_get(&fg->fallback_font_map, cell_text);
if (!vt_is_end(fi)) return fi.data->val; if (!vt_is_end(fi)) return fi.data->val;
ssize_t idx = load_fallback_font(fg, lc, bold, italic, emoji_presentation); ssize_t idx = load_fallback_font(fg, lc, bold, italic, emoji_presentation);

3
kitty_tests/screen.py
View File

@@ -692,6 +692,9 @@ class TestScreen(BaseTest):
t('\u25b6', 1, '\ufe0f', 2, '\ufe0e', 2) t('\u25b6', 1, '\ufe0f', 2, '\ufe0e', 2)
# wide + VS15 + VS16 # wide + VS15 + VS16
t('\U0001f610', 2, '\ufe0e', 1, '\ufe0f', 1) t('\U0001f610', 2, '\ufe0e', 1, '\ufe0f', 1)
# large numbers of combining chars
s.reset()
s.draw("\N{HEAVY EXCLAMATION MARK SYMBOL}" + 4500 * "\N{VARIATION SELECTOR-16}")
def test_writing_with_cursor_on_trailer_of_wide_character(self): def test_writing_with_cursor_on_trailer_of_wide_character(self):
s = self.create_screen() s = self.create_screen()