Merge pull request #18942 from neovim/backport-18933-to-release-0.7

zeertzjq · web-flow · commit 3cea4d6de96d · 2022-06-13T07:44:20.000+08:00
[Backport release-0.7] fix(buffer): disable buffer-updates before removing buffer from window
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
@@ -578,6 +578,10 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last, bool i
     return false;
   }
 
+  // Disable buffer-updates for the current buffer.
+  // No need to check `unload_buf`: in that case the function returned above.
+  buf_updates_unload(buf, false);
+
   if (win != NULL  // Avoid bogus clang warning.
       && win_valid_any_tab(win)
       && win->w_buffer == buf) {
@@ -590,10 +594,6 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last, bool i
     buf->b_nwindows--;
   }
 
-  // Disable buffer-updates for the current buffer.
-  // No need to check `unload_buf`: in that case the function returned above.
-  buf_updates_unload(buf, false);
-
   // Remove the buffer from the list.
   if (wipe_buf) {
     // Do not wipe out the buffer if it is used in a window.
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -7207,7 +7207,7 @@ void win_findbuf(typval_T *argvars, list_T *list)
   int bufnr = tv_get_number(&argvars[0]);
 
   FOR_ALL_TAB_WINDOWS(tp, wp) {
-    if (!wp->w_closing && wp->w_buffer->b_fnum == bufnr) {
+    if (wp->w_buffer->b_fnum == bufnr) {
       tv_list_append_number(list, wp->handle);
     }
   }
diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
@@ -252,23 +252,28 @@ describe('lua buffer event callbacks: on_lines', function()
     eq(2, meths.win_get_cursor(0)[1])
   end)
 
-  it('does not SEGFAULT when calling win_findbuf in on_detach', function()
-
-    exec_lua[[
+  it('does not SEGFAULT when accessing window buffer info in on_detach #14998', function()
+    local code = [[
       local buf = vim.api.nvim_create_buf(false, false)
 
       vim.cmd"split"
       vim.api.nvim_win_set_buf(0, buf)
 
       vim.api.nvim_buf_attach(buf, false, {
         on_detach = function(_, buf)
+          vim.fn.tabpagebuflist()
           vim.fn.win_findbuf(buf)
         end
       })
     ]]
 
+    exec_lua(code)
     command("q!")
     helpers.assert_alive()
+
+    exec_lua(code)
+    command("bd!")
+    helpers.assert_alive()
   end)
 
   it('#12718 lnume', function()

Original file line number	Diff line number	Diff line change
`@@ -7207,7 +7207,7 @@ void win_findbuf(typval_T argvars, list_T list)`
`7207`	`7207`	`int bufnr = tv_get_number(&argvars[0]);`
`7208`	`7208`
`7209`	`7209`	`FOR_ALL_TAB_WINDOWS(tp, wp) {`
`7210`		`- if (!wp->w_closing && wp->w_buffer->b_fnum == bufnr) {`
	`7210`	`+ if (wp->w_buffer->b_fnum == bufnr) {`
`7211`	`7211`	`tv_list_append_number(list, wp->handle);`
`7212`	`7212`	`}`
`7213`	`7213`	`}`