neovim

commit dc466f9a63ede5e2bbddc33688c0c972abfe9a52
parent a7eb1e60040d5e0c2ad5021b410683cabca26ba4
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 23 Jan 2024 06:51:10 +0800

vim-patch:9.1.0043: ml_get: invalid lnum when :s replaces visual selection (#27140)

Problem:  ml_get: invalid lnum when :s replaces visual selection
          (@ropery)
Solution: substitute may decrement the number of lines in a buffer,
          so validate, that the bottom lines of the visual selection
          stays within the max buffer line

fixes: vim/vim#13890
closes: vim/vim#13892

https://github.com/vim/vim/commit/7c71db3a58f658b4329b82ab603efa928d17bdbc

Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat:
M
src/nvim/regexp.c
 | 
5
+++++
M
test/old/testdir/test_visual.vim
 | 
8
++++++++

2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
@@ -1365,6 +1365,11 @@ static bool reg_match_visual(void)
       top = curbuf->b_visual.vi_end;
       bot = curbuf->b_visual.vi_start;
     }
+    // a substitue command may have
+    // removed some lines
+    if (bot.lnum > curbuf->b_ml.ml_line_count) {
+      bot.lnum = curbuf->b_ml.ml_line_count;
+    }
     mode = curbuf->b_visual.vi_mode;
     curswant = curbuf->b_visual.vi_curswant;
   }
diff --git a/test/old/testdir/test_visual.vim b/test/old/testdir/test_visual.vim
@@ -1626,4 +1626,12 @@ func Test_visual_drag_out_of_window()
   bwipe!
 endfunc
 
+func Test_visual_substitute_visual()
+  new
+  call setline(1, ['one', 'two', 'three'])
+  call feedkeys("Gk\<C-V>j$:s/\\%V\\_.*\\%V/foobar\<CR>", 'tx')
+  call assert_equal(['one', 'foobar'], getline(1, '$'))
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab