0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

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: #14140

Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Sean Dewar 2024-03-04 19:09:26 +01:00 committed by Christian Brabandt
parent e84490311b
commit 5131f224da
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 22 additions and 1 deletions

View File

@ -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;

View File

@ -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

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
149,
/**/
148,
/**/