IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3410: crash with linebreak, listchars and large tabstop

Browse Source 
Problem:    Crash with linebreak, listchars and large tabstop.
Solution:   Account for different size listchars for a tab. (closes vim/vim#8841)
89a54b413a
This commit is contained in:
zeertzjq 2022-01-21 18:16:16 +08:00
parent 296b8fbe3b
commit cb39c825c4
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/screen.c
View File

@ -3720,15 +3720,21 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
tab_len += n_extra - tab_len;
}
// if n_extra > 0, it gives the number of chars
// If n_extra > 0, it gives the number of chars
// to use for a tab, else we need to calculate the width
// for a tab
// for a tab.
int len = (tab_len * utf_char2len(wp->w_p_lcs_chars.tab2));
if (wp->w_p_lcs_chars.tab3) {
len += utf_char2len(wp->w_p_lcs_chars.tab3);
}
if (n_extra > 0) {
len += n_extra - tab_len;
}
c = wp->w_p_lcs_chars.tab1;
p = xmalloc(len + 1);
if (p == NULL) {
n_extra = 0;
} else {
memset(p, ' ', len);
p[len] = NUL;
xfree(p_extra_free);
@ -3740,13 +3746,11 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
}
int lcs = wp->w_p_lcs_chars.tab2;
// if tab3 is given, need to change the char
// for tab
// if tab3 is given, use it for the last char
if (wp->w_p_lcs_chars.tab3 && i == tab_len - 1) {
lcs = wp->w_p_lcs_chars.tab3;
}
utf_char2bytes(lcs, p);
p += utf_char2len(lcs);
p += utf_char2bytes(lcs, p);
n_extra += utf_char2len(lcs) - (saved_nextra > 0 ? 1 : 0);
}
p_extra = p_extra_free;
@ -3757,6 +3761,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
n_extra -= vcol_off;
}
}
}
{
int vc_saved = vcol_off;

10
src/nvim/testdir/test_listlbr_utf8.vim
View File

@ -69,6 +69,16 @@ func Test_nolinebreak_with_list()
call s:close_windows()
endfunc
" this was causing a crash
func Test_linebreak_with_list_and_tabs()
set linebreak list listchars=tab:⇤\ ⇥ tabstop=100
new
call setline(1, "\t\t\ttext")
redraw
bwipe!
set nolinebreak nolist listchars&vim tabstop=8
endfunc
func Test_linebreak_with_nolist()
call s:test_windows('setl nolist')
call setline(1, "\t*mask = nil;")