# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1705951805 -3600
# Node ID 8b5471360746ecfecbc3d41623283fe9b73d8a93
# Parent  6cf1bb481903b0883dd7747c284290ddfef2d105
patch 9.1.0043: ml_get: invalid lnum when :s replaces visual selection

Commit: https://github.com/vim/vim/commit/7c71db3a58f658b4329b82ab603efa928d17bdbc
Author: Christian Brabandt <cb@256bit.org>
Date:   Mon Jan 22 20:12:34 2024 +0100

    patch 9.1.0043: ml_get: invalid lnum when :s replaces visual selection

    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: #13890
    closes: #13892

    Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/regexp.c b/src/regexp.c
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1318,6 +1318,10 @@ 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/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -1622,4 +1622,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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    43,
+/**/
     42,
 /**/
     41,