aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2020-09-14 05:59:07 +0900
committererw7 <erw7.github@gmail.com>2020-09-15 03:29:18 +0900
commit484a6d32051e0c2bc22e1aa0e4d4a250c11002a8 (patch)
treeaed21edd42e82fb8cc65bab74e70dcd30834b04e
parent80eafef3bb54b3d695b4e23d02d2cb4572c6c224 (diff)
downloadrneovim-484a6d32051e0c2bc22e1aa0e4d4a250c11002a8.tar.gz
rneovim-484a6d32051e0c2bc22e1aa0e4d4a250c11002a8.tar.bz2
rneovim-484a6d32051e0c2bc22e1aa0e4d4a250c11002a8.zip
vim-patch:8.2.1677: memory access errors when calling setloclist() in autocommand
Problem: Memory access errors when calling setloclist() in an autocommand. Solution: Give an error if the list was changed unexpectedly. (closes vim/vim#6946) https://github.com/vim/vim/commit/4d170af0a9379da64d67dc3fa7cc7297956c6f52
-rw-r--r--src/nvim/quickfix.c42
-rw-r--r--src/nvim/testdir/test_quickfix.vim24
2 files changed, 60 insertions, 6 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index a416bfde14..e897be5f6b 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -239,7 +239,10 @@ static char_u *e_no_more_items = (char_u *)N_("E553: No more items");
static char_u *qf_last_bufname = NULL;
static bufref_T qf_last_bufref = { NULL, 0, 0 };
-static char *e_loc_list_changed = N_("E926: Current location list was changed");
+static char *e_current_quickfix_list_was_changed =
+ N_("E925: Current quickfix list was changed");
+static char *e_current_location_list_was_changed =
+ N_("E926: Current location list was changed");
// Counter to prevent autocmds from freeing up location lists when they are
// still being used.
@@ -2700,9 +2703,10 @@ static int qf_jump_edit_buffer(qf_info_T *qi, qfline_T *qf_ptr, int forceit,
win_T *oldwin, int *opened_window)
{
qf_list_T *qfl = qf_get_curlist(qi);
+ long old_changetick = qfl->qf_changedtick;
+ int old_qf_curlist = qi->qf_curlist;
qfltype_T qfl_type = qfl->qfl_type;
int retval = OK;
- int old_qf_curlist = qi->qf_curlist;
unsigned save_qfid = qfl->qf_id;
if (qf_ptr->qf_type == 1) {
@@ -2729,16 +2733,17 @@ static int qf_jump_edit_buffer(qf_info_T *qi, qfline_T *qf_ptr, int forceit,
}
if (qfl_type == QFLT_QUICKFIX && !qflist_valid(NULL, save_qfid)) {
- EMSG(_("E925: Current quickfix was changed"));
+ EMSG(_(e_current_quickfix_list_was_changed));
return NOTDONE;
}
if (old_qf_curlist != qi->qf_curlist
+ || old_changetick != qfl->qf_changedtick
|| !is_qf_entry_present(qfl, qf_ptr)) {
if (qfl_type == QFLT_QUICKFIX) {
- EMSG(_("E925: Current quickfix was changed"));
+ EMSG(_(e_current_quickfix_list_was_changed));
} else {
- EMSG(_(e_loc_list_changed));
+ EMSG(_(e_current_location_list_was_changed));
}
return NOTDONE;
}
@@ -2823,12 +2828,27 @@ static void qf_jump_print_msg(qf_info_T *qi, int qf_index, qfline_T *qf_ptr,
static int qf_jump_open_window(qf_info_T *qi, qfline_T *qf_ptr,
int *opened_window)
{
+ qf_list_T *qfl = qf_get_curlist(qi);
+ long old_changetick = qfl->qf_changedtick;
+ int old_qf_curlist = qi->qf_curlist;
+ qfltype_T qfl_type = qfl->qfl_type;
+
// For ":helpgrep" find a help window or open one.
if (qf_ptr->qf_type == 1 && (!bt_help(curwin->w_buffer) || cmdmod.tab != 0)) {
if (jump_to_help_window(qi, opened_window) == FAIL) {
return FAIL;
}
}
+ if (old_qf_curlist != qi->qf_curlist
+ || old_changetick != qfl->qf_changedtick
+ || !is_qf_entry_present(qfl, qf_ptr)) {
+ if (qfl_type == QFLT_QUICKFIX) {
+ EMSG(_(e_current_quickfix_list_was_changed));
+ } else {
+ EMSG(_(e_current_location_list_was_changed));
+ }
+ return FAIL;
+ }
// If currently in the quickfix window, find another window to show the
// file in.
@@ -2843,6 +2863,16 @@ static int qf_jump_open_window(qf_info_T *qi, qfline_T *qf_ptr,
return FAIL;
}
}
+ if (old_qf_curlist != qi->qf_curlist
+ || old_changetick != qfl->qf_changedtick
+ || !is_qf_entry_present(qfl, qf_ptr)) {
+ if (qfl_type == QFLT_QUICKFIX) {
+ EMSG(_(e_current_quickfix_list_was_changed));
+ } else {
+ EMSG(_(e_current_location_list_was_changed));
+ }
+ return FAIL;
+ }
return OK;
}
@@ -4866,7 +4896,7 @@ static bool vgr_qflist_valid(win_T *wp, qf_info_T *qi, unsigned qfid,
if (!qflist_valid(wp, qfid)) {
if (wp != NULL) {
// An autocmd has freed the location list
- EMSG(_(e_loc_list_changed));
+ EMSG(_(e_current_location_list_was_changed));
return false;
} else {
// Quickfix list is not found, create a new one.
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
index 52226327b1..0178413a8e 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -1284,6 +1284,30 @@ func Test_quickfix_was_changed_by_autocmd()
call XquickfixChangedByAutocmd('l')
endfunc
+func Test_setloclist_in_autocommand()
+ call writefile(['test1', 'test2'], 'Xfile')
+ edit Xfile
+ let s:bufnr = bufnr()
+ call setloclist(1,
+ \ [{'bufnr' : s:bufnr, 'lnum' : 1, 'text' : 'test1'},
+ \ {'bufnr' : s:bufnr, 'lnum' : 2, 'text' : 'test2'}])
+
+ augroup Test_LocList
+ au!
+ autocmd BufEnter * call setloclist(1,
+ \ [{'bufnr' : s:bufnr, 'lnum' : 1, 'text' : 'test1'},
+ \ {'bufnr' : s:bufnr, 'lnum' : 2, 'text' : 'test2'}], 'r')
+ augroup END
+
+ lopen
+ call assert_fails('exe "normal j\<CR>"', 'E926:')
+
+ augroup Test_LocList
+ au!
+ augroup END
+ call delete('Xfile')
+endfunc
+
func Test_caddbuffer_to_empty()
helpgr quickfix
call setqflist([], 'r')