patch 8.2.3949: using freed memory with /\%V

Problem:    Using freed memory with /\%V.
Solution:   Get the line again after getvvcol().

diff --git a/src/regexp.c b/src/regexp.c
index 7fbad451b6a5d384f1907cd1b8abb8fb236ea1b4..9e3d218fb9d0a37056cab76ee777ac59db8ade72 100644 (file)
--- 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;
     }

diff --git a/src/testdir/test_regexp_latin.vim b/src/testdir/test_regexp_latin.vim
index 96c317736df1009990dba940f0be476c5c63a349..03efdbea30e6316a5efd0f715844ca6a8483c407 100644 (file)
--- a/src/testdir/test_regexp_latin.vim
+++ b/src/testdir/test_regexp_latin.vim
@@ -1045,4 +1045,12 @@ func Test_using_mark_position()
   bwipe!
 endfunc
 
+func Test_using_visual_position()
+  " this was using freed memory
+  new
+  exe "norm 0o\<Esc>\<C-V>k\<C-X>o0"
+  /\%V
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index a362dca9a7d3c16effdb822c21b62da6fe4e7983..9f5ed308a1f258460dc005a2202ae6c87778b8d9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3949,
 /**/
     3948,
 /**/