aboutsummaryrefslogtreecommitdiff
path: root/vt.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-24 17:12:25 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-24 17:12:25 +0000
commitf20956ff1bdfb266ae9c690bd2961acf7b3f4845 (patch)
tree64168a49ef2c1cf5a20d37505ac709fdc3e07644 /vt.c
parentinstall: add -Dgrapheme-clustering to the list of custom meson options (diff)
composed: insert: require key to be unique
Diffstat (limited to 'vt.c')
-rw-r--r--vt.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/vt.c b/vt.c
index 94bd6685..7c77f7ec 100644
--- a/vt.c
+++ b/vt.c
@@ -761,11 +761,13 @@ action_utf8_print(struct terminal *term, wchar_t wc)
new_cc->width = grapheme_width;
term->composed_count++;
- key = composed_insert(&term->composed, new_cc);
- wc = CELL_COMB_CHARS_LO + key;
- xassert(wc <= CELL_COMB_CHARS_HI);
+ composed_insert(&term->composed, new_cc);
+ wc = CELL_COMB_CHARS_LO + key;
width = grapheme_width;
+
+ xassert(wc >= CELL_COMB_CHARS_LO);
+ xassert(wc <= CELL_COMB_CHARS_HI);
goto out;
}
}