Skip to content

Commit

Permalink
patch 8.2.5150: read past the end of the first line with ":0;'{"
Browse files Browse the repository at this point in the history
Problem:    Read past the end of the first line with ":0;'{".
Solution:   When on line zero check the column is valid for line one.
  • Loading branch information
brammool committed Jun 22, 2022
1 parent 6689df0 commit f7c7c3f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/ex_docmd.c
Expand Up @@ -3411,10 +3411,13 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent)
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;
}
}
Expand Down
8 changes: 8 additions & 0 deletions src/testdir/test_cmdline.vim
Expand Up @@ -808,6 +808,14 @@ func Test_illegal_address2()
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')
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -734,6 +734,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
5150,
/**/
5149,
/**/
Expand Down

0 comments on commit f7c7c3f

Please sign in to comment.