Mercurial > vim
changeset 9313:c0760b25f31d v7.4.1939
commit https://github.com/vim/vim/commit/28607ba2b82668503f8406bc13690d59af46deb3
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 15 21:44:51 2016 +0200
patch 7.4.1939
Problem: Memory access error when reading viminfo. (Dominique Pelle)
Solution: Correct index in jumplist when at the end.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 15 Jun 2016 21:45:05 +0200 |
| parents | 96b65a1b7964 |
| children | 1df449de5199 |
| files | src/mark.c src/testdir/test_viminfo.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mark.c +++ b/src/mark.c @@ -1525,6 +1525,9 @@ handle_viminfo_mark(garray_T *values, in 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, in 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];
--- a/src/testdir/test_viminfo.vim +++ b/src/testdir/test_viminfo.vim @@ -322,6 +322,7 @@ func Test_viminfo_jumplist() clearjumps rviminfo Xviminfo + let last_line = line('.') exe "normal \<C-O>" call assert_equal('time 30', getline('.')) exe "normal \<C-O>" @@ -336,6 +337,20 @@ func Test_viminfo_jumplist() exe "normal \<C-O>" call assert_equal('time 05', getline('.')) + " Test with jumplist full. + clearjumps + call setline(1, repeat(['match here'], 101)) + call cursor(1, 1) + call test_settime(10) + for i in range(100) + exe "normal /here\r" + endfor + rviminfo Xviminfo + + " must be newest mark that comes from viminfo. + exe "normal \<C-O>" + call assert_equal(last_line, line('.')) + bwipe! call delete('Xviminfo') endfunc