thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3949: using freed memory with /\%V

Browse Source 
Problem:    Using freed memory with /\%V.
Solution:   Get the line again after getvvcol().
This commit is contained in:
Bram Moolenaar
2021-12-30 14:49:43 +00:00
parent cfe3af284a
commit 4c13e5e676
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/regexp.c
View File

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