diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-12-12 16:43:44 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-12-12 16:43:44 +0100 |
| commit | ec54af4e26952d954a4cc009f62c80ea01445d30 (patch) | |
| tree | c67884d7beeb230ecae90b348522c1ea1ac88504 /src | |
| parent | a40e1687e757ea4aa41e84006c739f575db75703 (diff) | |
patch 9.0.2159: screenpos() may crash with neg. columnv9.0.2159
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/move.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_cursor_func.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/move.c b/src/move.c index fbb352a32e..861d84b84e 100644 --- a/src/move.c +++ b/src/move.c @@ -1531,6 +1531,8 @@ f_screenpos(typval_T *argvars UNUSED, typval_T *rettv) 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); diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim index 3cdf4cb7f9..2bdda869e6 100644 --- 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() diff --git a/src/version.c b/src/version.c index 4bb1c90bae..15ff51dd72 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2159, +/**/ 2158, /**/ 2157, |