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.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2c55e67..08a4830 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4229,8 +4229,10 @@
// 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).
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index bb4e45d..eaf9c23 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1989,5 +1989,19 @@
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
diff --git a/src/version.c b/src/version.c
index f3fbd45..43f87aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3489,
+/**/
3488,
/**/
3487,