diff options
| author | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-03-04 19:09:26 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-04 19:09:26 +0100 |
| commit | 5131f224da93f2e042a4b22545ef62b1b2ab8460 (patch) | |
| tree | e67aba1ca25efe3b2aeba9c54423742044f5c0f4 | |
| parent | e84490311ba32cb258cc738bc3caa8b448c84c8b (diff) | |
patch 9.1.0149: null pointer member access when accessing 'winfixbuf' propertyv9.1.0149
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: #14140
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/quickfix.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_winfixbuf.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 1f4176fe54..02a69d28c3 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -3146,7 +3146,7 @@ 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/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim index 0b15983932..2dffbe1f03 100644 --- a/src/testdir/test_winfixbuf.vim +++ b/src/testdir/test_winfixbuf.vim @@ -1576,6 +1576,7 @@ endfunc " Fail vim.command 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 diff --git a/src/version.c b/src/version.c index cecf0892b3..46781f0279 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 149, +/**/ 148, /**/ 147, |