changeset 14085:59e76d550c10 v8.1.0060

patch 8.1.0060: crash when autocommands delete the current buffer commit https://github.com/vim/vim/commit/600323b4ef51a58a8e800d8ca469383a3c911db7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 16 22:16:47 2018 +0200 patch 8.1.0060: crash when autocommands delete the current buffer Problem: Crash when autocommands delete the current buffer. (Dominique Pelle) Solution: Check that autocommands don't change the buffer.
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Jun 2018 22:30:06 +0200
parents 9557956bfc1e
children 56f44a087b09
files src/quickfix.c src/testdir/test_quickfix.vim src/version.c
diffstat 3 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -6272,8 +6272,16 @@ ex_cbuffer(exarg_T *eap)
 	    if (res >= 0)
 		qf_list_changed(qi, qi->qf_curlist);
 	    if (au_name != NULL)
+	    {
+		buf_T *curbuf_old = curbuf;
+
 		apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 						curbuf->b_fname, TRUE, curbuf);
+		if (curbuf != curbuf_old)
+		    // Autocommands changed buffer, don't jump now, "qi" may
+		    // be invalid.
+		    res = 0;
+	    }
 	    if (res > 0 && (eap->cmdidx == CMD_cbuffer ||
 						eap->cmdidx == CMD_lbuffer))
 		qf_jump(qi, 0, 0, eap->forceit);  /* display first error */
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -3350,3 +3350,15 @@ func Test_qftitle()
   call assert_equal('Errors', w:quickfix_title)
   cclose
 endfunc
+
+func Test_lbuffer_with_bwipe()
+  new
+  new
+  augroup nasty
+    au * * bwipe
+  augroup END
+  lbuffer
+  augroup nasty
+    au!
+  augroup END
+endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    60,
+/**/
     59,
 /**/
     58,