summaryrefslogtreecommitdiff
path: root/src/regexp.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-30 14:49:43 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-30 14:49:43 +0000
commit4c13e5e6763c6eb36a343a2b8235ea227202e952 (patch)
tree2ab6e7bed15c5d524eca43adead7697910a8f004 /src/regexp.c
parentcfe3af284a26178f4838df7c7489b2a1edd4c3a1 (diff)
downloadvim-git-4c13e5e6763c6eb36a343a2b8235ea227202e952.tar.gz
patch 8.2.3949: using freed memory with /\%Vv8.2.3949
Problem: Using freed memory with /\%V. Solution: Get the line again after getvvcol().
Diffstat (limited to 'src/regexp.c')
-rw-r--r--src/regexp.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/regexp.c b/src/regexp.c
index 7fbad451b..9e3d218fb 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1310,9 +1310,9 @@ reg_match_visual(void)
if (lnum < top.lnum || lnum > bot.lnum)
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;
@@ -1327,7 +1327,12 @@ reg_match_visual(void)
end = end2;
if (top.col == MAXCOL || bot.col == MAXCOL || curswant == MAXCOL)
end = MAXCOL;
- cols = 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;
+
+ cols = win_linetabsize(wp, rex.line, col);
if (cols < start || cols > end - (*p_sel == 'e'))
return FALSE;
}