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.0.2159: screenpos() may crash with neg. column

Browse Source 
Problem:  screenpos() may crash with neg. column
Solution: validate and correct column

closes: #13669

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2023-12-12 16:43:44 +01:00 committed by Christian Brabandt
parent a40e1687e7
commit ec54af4e26
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/move.c
View File

@ -1531,6 +1531,8 @@ f_screenpos(typval_T *argvars UNUSED, typval_T *rettv)
return; return;
} }
pos.col = tv_get_number(&argvars[2]) - 1; pos.col = tv_get_number(&argvars[2]) - 1;
if (pos.col < 0)
pos.col = 0;
pos.coladd = 0; pos.coladd = 0;
textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol); textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol);

5
src/testdir/test_cursor_func.vim
View File

@ -206,6 +206,11 @@ func Test_screenpos()
nmenu WinBar.TEST : nmenu WinBar.TEST :
call assert_equal(#{col: 1, row: 2, endcol: 1, curscol: 1}, screenpos(win_getid(), 1, 1)) call assert_equal(#{col: 1, row: 2, endcol: 1, curscol: 1}, screenpos(win_getid(), 1, 1))
nunmenu WinBar.TEST nunmenu WinBar.TEST
call assert_equal(#{col: 1, row: 1, endcol: 1, curscol: 1}, screenpos(win_getid(), 1, 1))
call assert_equal(#{col: 0, row: 0, endcol: 0, curscol: 0}, screenpos(0, 0, 1))
call assert_equal(#{col: 0, row: 0, endcol: 0, curscol: 0}, screenpos(0, -1, 1))
call assert_equal(#{col: 1, row: 1, endcol: 1, curscol: 1}, screenpos(0, 1, -v:maxcol))
endfunc endfunc
func Test_screenpos_fold() func Test_screenpos_fold()

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 */
/**/
2159,
/**/ /**/
2158, 2158,
/**/ /**/