aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0489: crash when autocmd clears vimpgrep location list

Browse Source 
Problem:    Crash when autocmd clears vimpgrep location list.
Solution:   Return from qf_jump_edit_buffer() early. (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar
2018-10-21 18:47:43 +02:00
parent 9f84ded38b
commit b6f1480a6a
3 changed files with 74 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/quickfix.c
View File

@@ -2985,6 +2985,8 @@ qf_jump_edit_buffer(
{
qf_list_T *qfl = &qi->qf_lists[qi->qf_curlist];
int retval = OK;
int old_qf_curlist = qi->qf_curlist;
int save_qfid = qfl->qf_id;
if (qf_ptr->qf_type == 1)
{
@@ -2993,38 +2995,33 @@ qf_jump_edit_buffer(
if (!can_abandon(curbuf, forceit))
{
no_write_message();
retval = FAIL;
return FAIL;
}
else
retval = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
ECMD_HIDE + ECMD_SET_HELP,
oldwin == curwin ? curwin : NULL);
}
else
{
int old_qf_curlist = qi->qf_curlist;
int save_qfid = qfl->qf_id;
retval = buflist_getfile(qf_ptr->qf_fnum,
(linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit);
if (IS_LL_STACK(qi))
{
// Location list. Check whether the associated window is still
// present and the list is still valid.
if (!win_valid_any_tab(oldwin))
// If a location list, check whether the associated window is still
// present.
if (IS_LL_STACK(qi) && !win_valid_any_tab(oldwin))
{
EMSG(_("E924: Current window was closed"));
*opened_window = FALSE;
return NOTDONE;
}
else if (!qflist_valid(oldwin, save_qfid))
if (IS_QF_STACK(qi) && !qflist_valid(NULL, save_qfid))
{
EMSG(_(e_loc_list_changed));
EMSG(_("E925: Current quickfix was changed"));
return NOTDONE;
}
}
else if (old_qf_curlist != qi->qf_curlist
if (old_qf_curlist != qi->qf_curlist
|| !is_qf_entry_present(qfl, qf_ptr))
{
if (IS_QF_STACK(qi))
@@ -3033,7 +3030,6 @@ qf_jump_edit_buffer(
EMSG(_(e_loc_list_changed));
return NOTDONE;
}
}
return retval;
}

42
src/testdir/test_quickfix.vim
View File

@@ -3255,6 +3255,17 @@ func Test_lvimgrep_crash()
augroup QF_Test
au!
augroup END
new | only
augroup QF_Test
au!
au BufEnter * call setloclist(0, [], 'r')
augroup END
call assert_fails('lvimgrep Test_lvimgrep_crash *', 'E926:')
augroup QF_Test
au!
augroup END
enew | only
endfunc
@@ -3337,6 +3348,37 @@ func Test_lhelpgrep_autocmd()
call assert_equal('help', &filetype)
call assert_equal(1, getloclist(0, {'nr' : '$'}).nr)
au! QuickFixCmdPost
new | only
augroup QF_Test
au!
au BufEnter * call setqflist([], 'f')
augroup END
call assert_fails('helpgrep quickfix', 'E925:')
augroup QF_Test
au! BufEnter
augroup END
new | only
augroup QF_Test
au!
au BufEnter * call setqflist([], 'r')
augroup END
call assert_fails('helpgrep quickfix', 'E925:')
augroup QF_Test
au! BufEnter
augroup END
new | only
augroup QF_Test
au!
au BufEnter * call setloclist(0, [], 'r')
augroup END
call assert_fails('lhelpgrep quickfix', 'E926:')
augroup QF_Test
au! BufEnter
augroup END
new | only
endfunc

2
src/version.c
View File

@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
489,
/**/
488,
/**/