aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0730: Crash with cursor-screenline and narrow window

Browse Source 
Problem:  Crash with cursor-screenline and narrow window
          (elig0n)
Solution: Don't set right_col when width2 is 0 (zeertzjq).

fixes: #15677
closes: #15678

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-09-14 10:40:29 +02:00 committed by Christian Brabandt
parent 86dc4f8b43
commit 59149f0269
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drawline.c
View File

@ -62,7 +62,7 @@ margin_columns_win(win_T *wp, int *left_col, int *right_col)
*left_col = 0; *left_col = 0;
*right_col = width1; *right_col = width1;
if (wp->w_virtcol >= (colnr_T)width1) if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0)
*right_col = width1 + ((wp->w_virtcol - width1) / width2 + 1) * width2; *right_col = width1 + ((wp->w_virtcol - width1) / width2 + 1) * width2;
if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0) if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0)
*left_col = (wp->w_virtcol - width1) / width2 * width2 + width1; *left_col = (wp->w_virtcol - width1) / width2 * width2 + width1;

11
src/testdir/test_cursorline.vim
View File

@ -309,6 +309,17 @@ func Test_cursorline_screenline_update()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
func Test_cursorline_screenline_zero_width()
CheckOption foldcolumn
set cursorline culopt=screenline winminwidth=1 foldcolumn=1
" This used to crash Vim
1vnew | redraw
bwipe!
set cursorline& culopt& winminwidth& foldcolumn&
endfunc
func Test_cursorline_cursorbind_horizontal_scroll() func Test_cursorline_cursorbind_horizontal_scroll()
CheckScreendump CheckScreendump

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
730,
/**/ /**/
729, 729,
/**/ /**/