From a0789478f6ebbb823670b7e14ce13ea3fd3b0217 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 8 Oct 2022 11:16:40 +0100 Subject: [PATCH] patch 9.0.0690: buffer size for expanding tab not correctly computed Problem: Buffer size for expanding tab not correctly computed. Solution: Correctly use size of end character. --- src/drawline.c | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/drawline.c b/src/drawline.c index e7f9fabab..cddb6ab65 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2805,9 +2805,10 @@ win_line( // If wlv.n_extra > 0, it gives the number of chars, to // use for a tab, else we need to calculate the width // for a tab. - len = (tab_len * mb_char2len(wp->w_lcs_chars.tab2)); + int tab2_len = mb_char2len(wp->w_lcs_chars.tab2); + len = tab_len * tab2_len; if (wp->w_lcs_chars.tab3) - len += mb_char2len(wp->w_lcs_chars.tab3); + len += mb_char2len(wp->w_lcs_chars.tab3) - tab2_len; if (wlv.n_extra > 0) len += wlv.n_extra - tab_len; c = wp->w_lcs_chars.tab1; diff --git a/src/version.c b/src/version.c index 1d6023846..37046ba98 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 690, /**/ 689, /**/ -- 2.40.0