Merge pull request #21234 from zeertzjq/vim-9.0.0965

vim-patch:9.0.{0965,0966,0967}: using one window for executing autocommands is insufficient

1 files changed, 29 insertions, 16 deletions

diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 2bff0fa2f9..dabec5e95e 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -2310,6 +2310,12 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
 
     // Set curwin/curbuf to buf and save a few things.
     aucmd_prepbuf(&aco, buf);
+    if (curbuf != buf) {
+      // Could not find a window for "buf".  Doing more might cause
+      // problems, better bail out.
+      return FAIL;
+    }
+
     set_bufref(&bufref, buf);
 
     if (append) {
@@ -3612,25 +3618,27 @@ nofail:
 
     // Apply POST autocommands.
     // Careful: The autocommands may call buf_write() recursively!
+    // Only do this when a window was found for "buf".
     aucmd_prepbuf(&aco, buf);
+    if (curbuf == buf) {
+      if (append) {
+        apply_autocmds_exarg(EVENT_FILEAPPENDPOST, fname, fname,
+                             false, curbuf, eap);
+      } else if (filtering) {
+        apply_autocmds_exarg(EVENT_FILTERWRITEPOST, NULL, fname,
+                             false, curbuf, eap);
+      } else if (reset_changed && whole) {
+        apply_autocmds_exarg(EVENT_BUFWRITEPOST, fname, fname,
+                             false, curbuf, eap);
+      } else {
+        apply_autocmds_exarg(EVENT_FILEWRITEPOST, fname, fname,
+                             false, curbuf, eap);
+      }
 
-    if (append) {
-      apply_autocmds_exarg(EVENT_FILEAPPENDPOST, fname, fname,
-                           false, curbuf, eap);
-    } else if (filtering) {
-      apply_autocmds_exarg(EVENT_FILTERWRITEPOST, NULL, fname,
-                           false, curbuf, eap);
-    } else if (reset_changed && whole) {
-      apply_autocmds_exarg(EVENT_BUFWRITEPOST, fname, fname,
-                           false, curbuf, eap);
-    } else {
-      apply_autocmds_exarg(EVENT_FILEWRITEPOST, fname, fname,
-                           false, curbuf, eap);
+      // restore curwin/curbuf and a few other things
+      aucmd_restbuf(&aco);
     }
 
-    // restore curwin/curbuf and a few other things
-    aucmd_restbuf(&aco);
-
     if (aborting()) {       // autocmds may abort script processing
       retval = false;
     }
@@ -5003,8 +5011,13 @@ void buf_reload(buf_T *buf, int orig_mode, bool reload_options)
   aco_save_T aco;
   int flags = READ_NEW;
 
-  // set curwin/curbuf for "buf" and save some things
+  // Set curwin/curbuf for "buf" and save some things.
   aucmd_prepbuf(&aco, buf);
+  if (curbuf != buf) {
+    // Failed to find a window for "buf", it is dangerous to continue,
+    // better bail out.
+    return;
+  }
 
   // Unless reload_options is set, we only want to read the text from the
   // file, not reset the syntax highlighting, clear marks, diff status, etc.