mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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: vim/vim#13669

ec54af4e26
(cherry picked from commit 6052fac625)
This commit is contained in:
zeertzjq
2023-12-13 05:56:14 +08:00
committed by github-actions[bot]
parent 59dd7aed40
commit 9caec77fae
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/move.c
View File

@@ -1025,6 +1025,9 @@ void f_screenpos(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
semsg(_(e_invalid_line_number_nr), pos.lnum); semsg(_(e_invalid_line_number_nr), pos.lnum);
return; return;
} }
if (pos.col < 0) {
pos.col = 0;
}
int row = 0; int row = 0;
int scol = 0, ccol = 0, ecol = 0; int scol = 0, ccol = 0, ecol = 0;
textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol, false); textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol, false);

5
test/old/testdir/test_cursor_func.vim
View File

@@ -173,6 +173,11 @@ func Test_screenpos()
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
setlocal winbar& setlocal winbar&
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()