From 606d45ccd8a2ad2956e2729f6135fd79fd2f6d72 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 18 Dec 2017 16:21:44 +0100 Subject: [PATCH] patch 8.0.1404: invalid memory access on exit Problem: Invalid memory access on exit when autocommands wipe out a buffer. (gy741, Dominique Pelle) Solution: Check if the buffer is still valid. (closes #2449) --- src/main.c | 7 ++++++- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index e8006c30bd..bfcc3e517b 100644 --- a/src/main.c +++ b/src/main.c @@ -1432,9 +1432,14 @@ getout(int exitval) buf = wp->w_buffer; if (CHANGEDTICK(buf) != -1) { + bufref_T bufref; + + set_bufref(&bufref, buf); apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname, buf->b_fname, FALSE, buf); - CHANGEDTICK(buf) = -1; /* note that we did it already */ + if (bufref_valid(&bufref)) + CHANGEDTICK(buf) = -1; /* note we did it already */ + /* start all over, autocommands may mess up the lists */ next_tp = first_tabpage; break; diff --git a/src/version.c b/src/version.c index 1ce42a91d5..283a92c466 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1404, /**/ 1403, /**/