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

patch 7.4.1939

Browse Source 
Problem:    Memory access error when reading viminfo. (Dominique Pelle)
Solution:   Correct index in jumplist when at the end.
This commit is contained in:
Bram Moolenaar
2016-06-15 21:44:51 +02:00
parent 36f0f0686c
commit 28607ba2b8
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mark.c
View File

@@ -1525,6 +1525,9 @@ handle_viminfo_mark(garray_T *values, int force)
if (idx < 0 && curwin->w_jumplistlen < JUMPLISTSIZE)
/* insert as the oldest entry */
idx = 0;
else if (idx == 0 && curwin->w_jumplistlen == JUMPLISTSIZE)
/* no space to insert as the oldest entry */
idx = -1;
}
else if (curwin->w_jumplistlen < JUMPLISTSIZE)
/* insert as oldest entry */
@@ -1537,6 +1540,7 @@ handle_viminfo_mark(garray_T *values, int force)
if (curwin->w_jumplistlen == JUMPLISTSIZE)
{
/* Drop the oldest entry. */
--idx;
vim_free(curwin->w_jumplist[0].fname);
for (i = 0; i < idx; ++i)
curwin->w_jumplist[i] = curwin->w_jumplist[i + 1];