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

patch 8.0.0962: crash with virtualedit and joining lines

Browse Source 
Problem:    Crash with virtualedit and joining lines. (Joshua T Corbin, Neovim
            #6726)
Solution:   When using a mark check that coladd is valid.
This commit is contained in:
Bram Moolenaar
2017-08-19 15:05:32 +02:00
parent 98ebd2bbec
commit 9aa1569128
6 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/misc2.c
View File

@@ -605,7 +605,18 @@ check_cursor_col_win(win_T *win)
else if (ve_flags == VE_ALL)
{
if (oldcoladd > win->w_cursor.col)
{
win->w_cursor.coladd = oldcoladd - win->w_cursor.col;
if (win->w_cursor.col < len && win->w_cursor.coladd > 0)
{
int cs, ce;
/* check that coladd is not more than the char width */
getvcol(win, &win->w_cursor, &cs, NULL, &ce);
if (win->w_cursor.coladd > ce - cs)
win->w_cursor.coladd = ce - cs;
}
}
else
/* avoid weird number when there is a miscalculation or overflow */
win->w_cursor.coladd = 0;