mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 04:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0962

Browse Source 
closes #6726

Problem:    Crash with virtualedit and joining lines.
            (Joshua T Corbin, Neovim #6726)
Solution:   When using a mark check that coladd is valid.

9aa1569128
This commit is contained in:
Justin M. Keyes
2017-10-21 02:04:35 +02:00
parent 6338199b76
commit 82b8382abe
4 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/cursor.c
View File

@@ -375,17 +375,27 @@ void check_cursor_col_win(win_T *win)
win->w_cursor.col = 0;
}
/* If virtual editing is on, we can leave the cursor on the old position,
* only we must set it to virtual. But don't do it when at the end of the
* line. */
if (oldcol == MAXCOL)
// If virtual editing is on, we can leave the cursor on the old position,
// only we must set it to virtual. But don't do it when at the end of the
// line.
if (oldcol == MAXCOL) {
win->w_cursor.coladd = 0;
else if (ve_flags == VE_ALL) {
if (oldcoladd > win->w_cursor.col)
} else if (ve_flags == VE_ALL) {
if (oldcoladd > win->w_cursor.col) {
win->w_cursor.coladd = oldcoladd - win->w_cursor.col;
else
/* avoid weird number when there is a miscalculation or overflow */
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;
}
}
}