Skip to content

Commit

Permalink
patch 8.2.4646: using buffer line after it has been freed
Browse files Browse the repository at this point in the history
Problem:    Using buffer line after it has been freed in old regexp engine.
Solution:   After getting mark get the line again.
  • Loading branch information
brammool committed Mar 29, 2022
1 parent fd01280 commit b55986c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/regexp_bt.c
Expand Up @@ -3360,8 +3360,17 @@ regmatch(
int mark = OPERAND(scan)[0];
int cmp = OPERAND(scan)[1];
pos_T *pos;
size_t col = REG_MULTI ? rex.input - rex.line : 0;

pos = getmark_buf(rex.reg_buf, mark, FALSE);

// Line may have been freed, get it again.
if (REG_MULTI)
{
rex.line = reg_getline(rex.lnum);
rex.input = rex.line + col;
}

if (pos == NULL // mark doesn't exist
|| pos->lnum <= 0) // mark isn't set in reg_buf
{
Expand Down
7 changes: 7 additions & 0 deletions src/testdir/test_regexp_latin.vim
Expand Up @@ -1042,10 +1042,17 @@ endfunc

func Test_using_mark_position()
" this was using freed memory
" new engine
new
norm O0
call assert_fails("s/\\%')", 'E486:')
bwipe!

" old engine
new
norm O0
call assert_fails("s/\\%#=1\\%')", 'E486:')
bwipe!
endfunc

func Test_using_visual_position()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4646,
/**/
4645,
/**/
Expand Down

0 comments on commit b55986c

Please sign in to comment.