Mercurial > vim
changeset 14826:75d474a8868a v8.1.0425
patch 8.1.0425: ml_get error and crash with appendbufline()
commit https://github.com/vim/vim/commit/9cea87c5775948a35098f3602746c20ecf95dbcd
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 21 16:59:45 2018 +0200
patch 8.1.0425: ml_get error and crash with appendbufline()
Problem: ml_get error and crash with appendbufline(). (Masashi Iizuka)
Solution: Set per-window buffer info. (Hirohito Higashi, closes https://github.com/vim/vim/issues/3455)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 21 Sep 2018 17:00:06 +0200 |
| parents | 098e66beb501 |
| children | 56b71e259a61 |
| files | src/buffer.c src/testdir/test_bufline.vim src/version.c |
| diffstat | 3 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -428,7 +428,10 @@ can_unload_buffer(buf_T *buf) FOR_ALL_WINDOWS(wp) if (wp->w_buffer == buf) + { can_unload = FALSE; + break; + } } if (!can_unload) EMSG(_("E937: Attempt to delete a buffer that is in use")); @@ -1742,6 +1745,9 @@ enter_buffer(buf_T *buf) /* mark cursor position as being invalid */ curwin->w_valid = 0; + buflist_setfpos(curbuf, curwin, curbuf->b_last_cursor.lnum, + curbuf->b_last_cursor.col, TRUE); + /* Make sure the buffer is loaded. */ if (curbuf->b_ml.ml_mfp == NULL) /* need to load the file */ {
--- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -91,6 +91,33 @@ func Test_appendbufline() exe "bwipe! " . b endfunc +func Test_appendbufline_no_E315() + let after = [ + \ 'set stl=%f ls=2', + \ 'new', + \ 'let buf = bufnr("%")', + \ 'quit', + \ 'vsp', + \ 'exec "buffer" buf', + \ 'wincmd w', + \ 'call appendbufline(buf, 0, "abc")', + \ 'redraw', + \ 'while getbufline(buf, 1)[0] =~ "^\\s*$"', + \ ' sleep 10m', + \ 'endwhile', + \ 'au VimLeavePre * call writefile([v:errmsg], "Xerror")', + \ 'au VimLeavePre * call writefile(["done"], "Xdone")', + \ 'qall!', + \ ] + if !RunVim([], after, '--clean') + return + endif + call assert_notmatch("^E315:", readfile("Xerror")[0]) + call assert_equal("done", readfile("Xdone")[0]) + call delete("Xerror") + call delete("Xdone") +endfunc + func Test_deletebufline() new let b = bufnr('%')