0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 8.0.1750: crash when clearing loccation list in autocommand

Problem:    Crash when clearing loccation list in autocommand.
Solution:   Check if "qi" equals "ql_info". (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar
2018-04-23 21:29:48 +02:00
parent 6537c421bb
commit 3b9474b4ad
3 changed files with 17 additions and 5 deletions

View File

@@ -5897,7 +5897,6 @@ ex_helpgrep(exarg_T *eap)
char_u *lang; char_u *lang;
#endif #endif
qf_info_T *qi = &ql_info; qf_info_T *qi = &ql_info;
qf_info_T *save_qi;
int new_qi = FALSE; int new_qi = FALSE;
win_T *wp; win_T *wp;
char_u *au_name = NULL; char_u *au_name = NULL;
@@ -5951,9 +5950,6 @@ ex_helpgrep(exarg_T *eap)
} }
} }
/* Autocommands may change the list. Save it for later comparison */
save_qi = qi;
regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING); regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING);
regmatch.rm_ic = FALSE; regmatch.rm_ic = FALSE;
if (regmatch.regprog != NULL) if (regmatch.regprog != NULL)
@@ -6086,7 +6082,7 @@ ex_helpgrep(exarg_T *eap)
{ {
apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
curbuf->b_fname, TRUE, curbuf); curbuf->b_fname, TRUE, curbuf);
if (!new_qi && qi != save_qi && qf_find_buf(qi) == NULL) if (!new_qi && qi != &ql_info && qf_find_buf(qi) == NULL)
/* autocommands made "qi" invalid */ /* autocommands made "qi" invalid */
return; return;
} }

View File

@@ -3175,3 +3175,17 @@ func Test_vimgrep_autocmd()
call delete('Xtest2.txt') call delete('Xtest2.txt')
call setqflist([], 'f') call setqflist([], 'f')
endfunc endfunc
" The following test used to crash Vim
func Test_lhelpgrep_autocmd()
lhelpgrep quickfix
autocmd QuickFixCmdPost * call setloclist(0, [], 'f')
lhelpgrep buffer
call assert_equal('help', &filetype)
call assert_equal(0, getloclist(0, {'nr' : '$'}).nr)
lhelpgrep tabpage
call assert_equal('help', &filetype)
call assert_equal(1, getloclist(0, {'nr' : '$'}).nr)
au! QuickFixCmdPost
new | only
endfunc

View File

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