forked from aniani/vim
patch 9.0.0483: illegal memory access when replacing in virtualedit mode
Problem: Illegal memory access when replacing in virtualedit mode. Solution: Check for replacing NUL after Tab.
This commit is contained in:
12
src/ops.c
12
src/ops.c
@@ -1173,6 +1173,8 @@ op_replace(oparg_T *oap, int c)
|
||||
|
||||
while (LTOREQ_POS(curwin->w_cursor, oap->end))
|
||||
{
|
||||
int done = FALSE;
|
||||
|
||||
n = gchar_cursor();
|
||||
if (n != NUL)
|
||||
{
|
||||
@@ -1186,6 +1188,7 @@ op_replace(oparg_T *oap, int c)
|
||||
if (curwin->w_cursor.lnum == oap->end.lnum)
|
||||
oap->end.col += new_byte_len - old_byte_len;
|
||||
replace_character(c);
|
||||
done = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1204,10 +1207,15 @@ op_replace(oparg_T *oap, int c)
|
||||
if (curwin->w_cursor.lnum == oap->end.lnum)
|
||||
getvpos(&oap->end, end_vcol);
|
||||
}
|
||||
PBYTE(curwin->w_cursor, c);
|
||||
// with "coladd" set may move to just after a TAB
|
||||
if (gchar_cursor() != NUL)
|
||||
{
|
||||
PBYTE(curwin->w_cursor, c);
|
||||
done = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum)
|
||||
if (!done && virtual_op && curwin->w_cursor.lnum == oap->end.lnum)
|
||||
{
|
||||
int virtcols = oap->end.coladd;
|
||||
|
||||
|
Reference in New Issue
Block a user