neovim

commit e8bc23db62c37e91d0c277b4bddf652db6a9d5f1
parent 141182d6c6c06ad56413b81a518ba9b777a0cbe0
Author: Colin Kennedy <colinvfx@gmail.com>
Date:   Mon,  4 Mar 2024 21:25:15 -0800

vim-patch:9.1.0149: null pointer member access when accessing 'winfixbuf' property

Problem:  qf_goto_win_with_qfl_file may check if prevwin has 'winfixbuf'
          set without checking if it's valid first.
Solution: Reverse the condition. Add a test, a modeline, and a missing
          CheckFeature. (Searn Dewar)

closes: vim/vim#14140

https://github.com/vim/vim/commit/5131f224da93f2e042a4b22545ef62b1b2ab8460

Co-authored-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>

Diffstat:
M
src/nvim/quickfix.c
 | 
2
+-
M
test/old/testdir/test_winfixbuf.vim
 | 
19
+++++++++++++++++++

2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
@@ -2699,7 +2699,7 @@ static void qf_goto_win_with_qfl_file(int qf_fnum)
       // Didn't find it, go to the window before the quickfix
       // window, unless 'switchbuf' contains 'uselast': in this case we
       // try to jump to the previously used window first.
-      if ((swb_flags & SWB_USELAST) && !prevwin->w_p_wfb && win_valid(prevwin)) {
+      if ((swb_flags & SWB_USELAST) && win_valid(prevwin) && !prevwin->w_p_wfb) {
         win = prevwin;
       } else if (altwin != NULL) {
         win = altwin;
diff --git a/test/old/testdir/test_winfixbuf.vim b/test/old/testdir/test_winfixbuf.vim
@@ -1576,6 +1576,7 @@ endfunc
 
 " Fail vim.cmd if we try to change buffers while 'winfixbuf' is set
 func Test_lua_command()
+  " CheckFeature lua
   call s:reset_all_buffers()
 
   enew
@@ -3129,3 +3130,21 @@ func Test_wprevious()
   call delete("middle")
   call delete("last")
 endfunc
+
+func Test_quickfix_switchbuf_invalid_prevwin()
+  call s:reset_all_buffers()
+
+  let [l:first, _] = s:make_simple_quickfix()
+  call assert_notequal(l:first, bufnr())
+  call assert_equal(1, winnr('$'))
+
+  set switchbuf=uselast
+  split
+  copen
+  execute winnr('#') 'quit'
+
+  call assert_fails('cfirst', 'E1513:')
+  set switchbuf&
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab