aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0991: crash when reading help index with various options set

Browse Source 
Problem:    Crash when reading help index with various options set. (Marius
            Gedminas)
Solution:   Do not set wlv.c_extra to NUL when wlv.p_extra is NULL.
            (closes #11651)
This commit is contained in:
Bram Moolenaar
2022-12-02 16:39:44 +00:00
parent c96b7f5d2a
commit c67c89c758
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/drawline.c
View File

@@ -2894,10 +2894,10 @@ win_line(
// into "ScreenLines".
if (c == TAB && (!wp->w_p_list || wp->w_lcs_chars.tab1))
{
int tab_len = 0;
long vcol_adjusted = wlv.vcol; // removed showbreak length
int tab_len = 0;
long vcol_adjusted = wlv.vcol; // removed showbreak len
#ifdef FEAT_LINEBREAK
char_u *sbr = get_showbreak_value(wp);
char_u *sbr = get_showbreak_value(wp);
// only adjust the tab_len, when at the first column
// after the showbreak value was drawn
@@ -2917,8 +2917,10 @@ win_line(
#ifdef FEAT_LINEBREAK
if (!wp->w_p_lbr || !wp->w_p_list)
#endif
{
// tab amount depends on current column
wlv.n_extra = tab_len;
}
#ifdef FEAT_LINEBREAK
else
{
@@ -2940,9 +2942,9 @@ win_line(
# endif
if (tab_len > 0)
{
// 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.
// 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.
int tab2_len = mb_char2len(wp->w_lcs_chars.tab2);
len = tab_len * tab2_len;
if (wp->w_lcs_chars.tab3)
@@ -3018,7 +3020,7 @@ win_line(
? wp->w_lcs_chars.tab3
: wp->w_lcs_chars.tab1;
#ifdef FEAT_LINEBREAK
if (wp->w_p_lbr)
if (wp->w_p_lbr && wlv.p_extra != NULL)
wlv.c_extra = NUL; // using p_extra from above
else
#endif