vim-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.
f7c7c3fad6
This commit is contained in:
zeertzjq
2022-06-23 06:22:43 +08:00
parent 801faeaae2
commit f088915495
2 changed files with 12 additions and 1 deletions

View File

@@ -2826,10 +2826,13 @@ int parse_cmd_address(exarg_T *eap, char **errormsg, bool silent)
curwin->w_cursor.lnum = eap->line2; curwin->w_cursor.lnum = eap->line2;
// Don't leave the cursor on an illegal line or column, but do // 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. // Check the cursor position before returning.
if (eap->line2 > 0) { if (eap->line2 > 0) {
check_cursor(); check_cursor();
} else {
check_cursor_col();
} }
need_check_cursor = true; need_check_cursor = true;
} }

View File

@@ -636,6 +636,14 @@ func Test_illegal_address2()
call delete('Xtest.vim') call delete('Xtest.vim')
endfunc 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() func Test_cmdline_complete_wildoptions()
help help
call feedkeys(":tag /\<c-a>\<c-b>\"\<cr>", 'tx') call feedkeys(":tag /\<c-a>\<c-b>\"\<cr>", 'tx')