changeset 31355:45a03dd92f28 v9.0.1011

patch 9.0.1011: ml_get error when using screenpos() Commit: https://github.com/vim/vim/commit/99d19438cabaf13074229d9a32e3a4af9ce98744 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 5 16:23:24 2022 +0000 patch 9.0.1011: ml_get error when using screenpos() Problem: ml_get error when using screenpos(). Solution: Give an error for the line number. (closes https://github.com/vim/vim/issues/11661)
author Bram Moolenaar <Bram@vim.org>
date Mon, 05 Dec 2022 17:30:06 +0100
parents 81fbd5f34ee7
children f39db32b3f7c
files src/move.c src/testdir/test_cursor_func.vim src/version.c
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/move.c
+++ b/src/move.c
@@ -1500,6 +1500,11 @@ f_screenpos(typval_T *argvars UNUSED, ty
 	return;
 
     pos.lnum = tv_get_number(&argvars[1]);
+    if (pos.lnum > wp->w_buffer->b_ml.ml_line_count)
+    {
+	semsg(_(e_invalid_line_number_nr), pos.lnum);
+	return;
+    }
     pos.col = tv_get_number(&argvars[2]) - 1;
     pos.coladd = 0;
     textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol);
--- a/src/testdir/test_cursor_func.vim
+++ b/src/testdir/test_cursor_func.vim
@@ -167,6 +167,9 @@ func Test_screenpos_number()
   let pos = screenpos(winid, 1, 66)
   call assert_equal(winrow, pos.row)
   call assert_equal(wincol + 66 + 3, pos.col)
+
+  call assert_fails('echo screenpos(0, 2, 1)', 'E966:')
+
   close
   bwipe!
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1011,
+/**/
     1010,
 /**/
     1009,