Mercurial > vim
changeset 33920:28e1e956f42c v9.0.2159
patch 9.0.2159: screenpos() may crash with neg. column
Commit: https://github.com/vim/vim/commit/ec54af4e26952d954a4cc009f62c80ea01445d30
Author: zeertzjq <zeertzjq@outlook.com>
Date: Tue Dec 12 16:43:44 2023 +0100
patch 9.0.2159: screenpos() may crash with neg. column
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 12 Dec 2023 17:00:08 +0100 |
| parents | 7512223bb93c |
| children | 55aff9ec6215 |
| files | src/move.c src/testdir/test_cursor_func.vim src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -1531,6 +1531,8 @@ f_screenpos(typval_T *argvars UNUSED, ty return; } pos.col = tv_get_number(&argvars[2]) - 1; + if (pos.col < 0) + pos.col = 0; pos.coladd = 0; textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol);
--- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -206,6 +206,11 @@ func Test_screenpos() nmenu WinBar.TEST : call assert_equal(#{col: 1, row: 2, endcol: 1, curscol: 1}, screenpos(win_getid(), 1, 1)) 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 func Test_screenpos_fold()