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

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>
This commit is contained in:
Christian Brabandt 2024-01-22 20:12:34 +01:00
parent 3b2c27415d
commit 7c71db3a58
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 14 additions and 0 deletions

View File

@ -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;
}

View File

@ -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

View File

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