diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-03-10 20:32:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 20:32:13 +0800 |
| commit | 3a32aa96159ae1fdd0efd55389a4b1c2f92c98f7 (patch) | |
| tree | 4dce94dcf97eb45765253bc9834e64a9ed014077 /src/nvim/regexp.c | |
| parent | 9e9322b222566c0f92bb6df034d9b316317c81d5 (diff) | |
| parent | a80ec88906220b6527c553f7614180ba3bfde169 (diff) | |
| download | rneovim-3a32aa96159ae1fdd0efd55389a4b1c2f92c98f7.tar.gz rneovim-3a32aa96159ae1fdd0efd55389a4b1c2f92c98f7.tar.bz2 rneovim-3a32aa96159ae1fdd0efd55389a4b1c2f92c98f7.zip | |
Merge pull request #17671 from zeertzjq/vim-8.2.3949
vim-patch:8.2.{3949,3950}: fix two crashes with /\%V
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 412cdac21b..009a26d4e0 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -1136,8 +1136,8 @@ static bool reg_match_visual(void) return false; } + col = (colnr_T)(rex.input - rex.line); if (mode == 'v') { - col = (colnr_T)(rex.input - rex.line); if ((lnum == top.lnum && col < top.col) || (lnum == bot.lnum && col >= bot.col + (*p_sel != 'e'))) { return false; @@ -1152,8 +1152,12 @@ static bool reg_match_visual(void) if (top.col == MAXCOL || bot.col == MAXCOL || curswant == MAXCOL) { end = MAXCOL; } - unsigned int cols_u = win_linetabsize(wp, rex.line, - (colnr_T)(rex.input - rex.line)); + + // getvvcol() flushes rex.line, need to get it again + rex.line = reg_getline(rex.lnum); + rex.input = rex.line + col; + + unsigned int cols_u = win_linetabsize(wp, rex.line, col); assert(cols_u <= MAXCOL); colnr_T cols = (colnr_T)cols_u; if (cols < start || cols > end - (*p_sel == 'e')) { |