From fc57380c3f1370c26b8c1eddcf9bccbad58e11aa Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 30 Dec 2011 15:01:59 +0100 Subject: 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) --- src/ex_cmds.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/ex_cmds.c') diff --git a/src/ex_cmds.c b/src/ex_cmds.c index e81b4a2be..519655beb 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3390,6 +3390,13 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin) (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 */ { -- cgit v1.2.1