Permalink
Browse files

patch 7.4.2328

Problem:    Crash when BufWinLeave autocmd goes to another tab page. (Hirohito
            Higashi)
Solution:   Make close_buffer() go back to the right window.
  • Loading branch information...
1 parent c8fe338 commit f9e687e0681a250e1549ab27b6c7ef2c500395e3 @brammool brammool committed Sep 4, 2016
Showing with 30 additions and 0 deletions.
  1. +18 −0 src/buffer.c
  2. +10 −0 src/testdir/test_autocmd.vim
  3. +2 −0 src/version.c
View
@@ -450,6 +450,11 @@ close_buffer(
int is_curbuf;
int nwindows;
bufref_T bufref;
+# ifdef FEAT_WINDOWS
+ int is_curwin = (curwin!= NULL && curwin->w_buffer == buf);
+ win_T *the_curwin = curwin;
+ tabpage_T *the_curtab = curtab;
+# endif
#endif
int unload_buf = (action != 0);
int del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
@@ -544,6 +549,19 @@ close_buffer(
return;
# endif
}
+
+# ifdef FEAT_WINDOWS
+ /* If the buffer was in curwin and the window has changed, go back to that
+ * window, if it still exists. This avoids that ":edit x" triggering a
+ * "tabnext" BufUnload autocmd leaves a window behind without a buffer. */
+ if (is_curwin && curwin != the_curwin && win_valid_any_tab(the_curwin))
+ {
+ block_autocmds();
+ goto_tabpage_win(the_curtab, the_curwin);
+ unblock_autocmds();
+ }
+# endif
+
nwindows = buf->b_nwindows;
#endif
@@ -83,6 +83,16 @@ function Test_autocmd_bufunload_with_tabnext()
quit
endfunc
+function Test_autocmd_bufwinleave_with_tabfirst()
+ tabedit
+ augroup sample
+ autocmd!
+ autocmd BufWinLeave <buffer> tabfirst
+ augroup END
+ call setline(1, ['a', 'b', 'c'])
+ edit! a.txt
+endfunc
+
" SEGV occurs in older versions. (At least 7.4.2321 or older)
function Test_autocmd_bufunload_avoiding_SEGV_01()
split aa.txt
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2328,
+/**/
2327,
/**/
2326,

0 comments on commit f9e687e

Please sign in to comment.