commit 3b9474b4ad4d85b5396f7f641b436f193dc9d486
author Bram Moolenaar <Bram@vim.org> Mon Apr 23 21:29:48 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Apr 23 21:29:48 2018 +0200
tree 32e8c88604f6da2d38708363437f760732444462
parent 6537c421bb626ee92a2487a543e6287d33461bd0

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)

src/quickfix.c

diff --git a/src/quickfix.c b/src/quickfix.c
index 39e3913..6142825 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -5897,7 +5897,6 @@
     char_u	*lang;
 #endif
     qf_info_T	*qi = &ql_info;
-    qf_info_T	*save_qi;
     int		new_qi = FALSE;
     win_T	*wp;
     char_u	*au_name =  NULL;
@@ -5951,9 +5950,6 @@
 	}
     }
 
-    /* Autocommands may change the list. Save it for later comparison */
-    save_qi = qi;
-
     regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING);
     regmatch.rm_ic = FALSE;
     if (regmatch.regprog != NULL)
@@ -6086,7 +6082,7 @@
     {
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 					       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 */
 	    return;
     }

src/testdir/test_quickfix.vim

diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index b0e14e6..12bfe32 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -3175,3 +3175,17 @@
   call delete('Xtest2.txt')
   call setqflist([], 'f')
 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

src/version.c

diff --git a/src/version.c b/src/version.c
index 5589204..123db5b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1750,
+/**/
     1749,
 /**/
     1748,