forked from aniani/vim
patch 8.2.4646: using buffer line after it has been freed
Problem: Using buffer line after it has been freed in old regexp engine. Solution: After getting mark get the line again.
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
@@ -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()
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
4646,
|
||||
/**/
|
||||
4645,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user