0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.2.3489: ml_get error after search with range

Problem:    ml_get error after search with range.
Solution:   Limit the line number to the buffer line count.
This commit is contained in:
Bram Moolenaar 2021-10-09 13:58:55 +01:00
parent 26190b2701
commit 35a319b77f
3 changed files with 20 additions and 2 deletions

View File

@ -4229,8 +4229,10 @@ get_address(
// When '/' or '?' follows another address, start from
// there.
if (lnum != MAXLNUM)
curwin->w_cursor.lnum = lnum;
if (lnum > 0 && lnum != MAXLNUM)
curwin->w_cursor.lnum =
lnum > curbuf->b_ml.ml_line_count
? curbuf->b_ml.ml_line_count : lnum;
// Start a forward search at the end of the line (unless
// before the first line).

View File

@ -1989,5 +1989,19 @@ func Test_no_last_search_pattern()
call feedkeys("??\<C-T>", 'xt')
endfunc
func Test_search_with_invalid_range()
new
let lines =<< trim END
/\%.v
5/
c
END
call writefile(lines, 'Xrangesearch')
source Xrangesearch
bwipe!
call delete('Xrangesearch')
endfunc
" vim: shiftwidth=2 sts=2 expandtab

View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3489,
/**/
3488,
/**/