patch 8.2.5150: read past the end of the first line with ":0;'{"
Problem: Read past the end of the first line with ":0;'{".
Solution: When on line zero check the column is valid for line one.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 1185cd1..271e7e2 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3411,10 +3411,13 @@
curwin->w_cursor.lnum = eap->line2;
// Don't leave the cursor on an illegal line or column, but do
- // accept zero as address, so 0;/PATTERN/ works correctly.
+ // accept zero as address, so 0;/PATTERN/ works correctly
+ // (where zero usually means to use the first line).
// Check the cursor position before returning.
if (eap->line2 > 0)
check_cursor();
+ else
+ check_cursor_col();
need_check_cursor = TRUE;
}
}
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 9c08d13..3685336 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -808,6 +808,14 @@
call delete('Xtest.vim')
endfunc
+func Test_mark_from_line_zero()
+ " this was reading past the end of the first (empty) line
+ new
+ norm oxxxx
+ call assert_fails("0;'(", 'E20:')
+ bwipe!
+endfunc
+
func Test_cmdline_complete_wildoptions()
help
call feedkeys(":tag /\<c-a>\<c-b>\"\<cr>", 'tx')
diff --git a/src/version.c b/src/version.c
index 609c955..b947061 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5150,
+/**/
5149,
/**/
5148,