Mercurial > vim

diff src/ex_cmds.c @ 3242:48252b5fd170 v7.3.390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.390 Problem: Using NULL buffer pointer in a window. Solution: Check for w_buffer being NULL in more places. (Bjorn Winckler)
author Bram Moolenaar <bram@vim.org>
date Fri, 30 Dec 2011 15:01:59 +0100
parents 074ddc768fea
children 9ccdc4a69d8f
line wrap: on
line diff
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3390,6 +3390,13 @@ do_ecmd(fnum, ffname, sfname, eap, newln
 				      (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD);
 
 #ifdef FEAT_AUTOCMD
+		/* Autocommands may open a new window and leave oldwin open
+		 * which leads to crashes since the above call sets
+		 * oldwin->w_buffer to NULL. */
+		if (curwin != oldwin && oldwin != aucmd_win
+			     && win_valid(oldwin) && oldwin->w_buffer == NULL)
+		    win_close(oldwin, FALSE);
+
 # ifdef FEAT_EVAL
 		if (aborting())	    /* autocmds may abort script processing */
 		{