From a79fd56923744e331b3a5badbf9186100818fb45 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 20 Dec 2018 20:47:32 +0100 Subject: patch 8.1.0611: crash when using terminal with long composing characters Problem: Crash when using terminal with long composing characters. Solution: Make space for all characters. (Yasuhiro Matsumoto, closes #3619, closes #3703) --- src/terminal.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/terminal.c b/src/terminal.c index 42897bf07..5a0165814 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -1561,7 +1561,8 @@ update_snapshot(term_T *term) cell2cellattr(&cell, &p[pos.col]); - if (ga_grow(&ga, MB_MAXBYTES) == OK) + // Each character can be up to 6 bytes. + if (ga_grow(&ga, VTERM_MAX_CHARS_PER_CELL * 6) == OK) { int i; int c; diff --git a/src/version.c b/src/version.c index 3c194aefe..99513d1dc 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 611, /**/ 610, /**/ -- cgit v1.2.1