Mercurial > vim

diff src/ex_docmd.c @ 11635:70bc7b107610 v8.0.0700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0700: segfault with QuitPre autocommand closes the window commit https://github.com/vim/vim/commit/0ea5070d79c8a13fb2403280a72f968495b0fab7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 8 14:44:50 2017 +0200 patch 8.0.0700: segfault with QuitPre autocommand closes the window Problem: Segfault with QuitPre autocommand closes the window. (Marek) Solution: Check that the window pointer is still valid. (Christian Brabandt, closes #1817)
author Christian Brabandt <cb@256bit.org>
date Sat, 08 Jul 2017 14:45:03 +0200
parents b8299e742f41
children 74abb6c84984
line wrap: on
line diff
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7271,8 +7271,11 @@ ex_quit(exarg_T *eap)
     apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf);
     /* Refuse to quit when locked or when the buffer in the last window is
      * being closed (can only happen in autocommands). */
-    if (curbuf_locked() || (wp->w_buffer->b_nwindows == 1
-						&& wp->w_buffer->b_locked > 0))
+    if (curbuf_locked()
+# ifdef FEAT_WINDOWS
+	    || !win_valid(wp)
+# endif
+	    || (wp->w_buffer->b_nwindows == 1 && wp->w_buffer->b_locked > 0))
 	return;
 #endif