diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-17 23:22:26 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-19 01:36:00 -0400 |
| commit | a6707f5791ddfa3872fa22bc2c384847976d2fee (patch) | |
| tree | c32a6654e8f3d30aaafeb9d78b4c16517e196a33 | |
| parent | 8bea8d7b4767d896e5c557ea9603e3d55e8e47af (diff) | |
| download | rneovim-a6707f5791ddfa3872fa22bc2c384847976d2fee.tar.gz rneovim-a6707f5791ddfa3872fa22bc2c384847976d2fee.tar.bz2 rneovim-a6707f5791ddfa3872fa22bc2c384847976d2fee.zip | |
vim-patch:8.1.0073: crash when autocommands call setloclist()
Problem: Crash when autocommands call setloclist(). (Dominique Pelle)
Solution: If the quickfix list changes then don't jump to the error.
https://github.com/vim/vim/commit/0366c0161e988e32420d2f37111a60129684905b
| -rw-r--r-- | src/nvim/quickfix.c | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 0e4fa0afc6..304df6f99b 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -5368,8 +5368,11 @@ void ex_cexpr(exarg_T *eap) apply_autocmds(EVENT_QUICKFIXCMDPOST, (char_u *)au_name, curbuf->b_fname, true, curbuf); } - if (res > 0 && (eap->cmdidx == CMD_cexpr || eap->cmdidx == CMD_lexpr)) { - qf_jump(qi, 0, 0, eap->forceit); // display first error + if (res > 0 + && (eap->cmdidx == CMD_cexpr || eap->cmdidx == CMD_lexpr) + && qi == ll_get_or_alloc_list(curwin)) { + // Jump to the first error if autocmds didn't free the list. + qf_jump(qi, 0, 0, eap->forceit); } } else { EMSG(_("E777: String or List expected")); diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index fcb02d3437..4d78c67f5c 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -3373,6 +3373,17 @@ func Test_lbuffer_with_bwipe() augroup END endfunc +func Test_setloclist_in_aucmd() + " This was using freed memory. + augroup nasty + au * * call setloclist(0, [], 'f') + augroup END + lexpr "x" + augroup nasty + au! + augroup END +endfunc + " Tests for the "CTRL-W <CR>" command. func Xview_result_split_tests(cchar) call s:setup_commands(a:cchar) |