diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-03-06 19:31:39 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-06 20:43:05 +0100 |
| commit | af7ae8160041e2d17c56945381e9370e7178e596 (patch) | |
| tree | dcce3967b862f336c2586d6742f449b6ad4d2682 | |
| parent | a72d1be5a9984709fc66f460b443ad4a38506113 (diff) | |
patch 9.1.0152: Coverity complains about ignoring return valuev9.1.0152
Problem: Coverity complains about ignoring return value of win_split()
(after v9.1.150)
Solution: Check if win_split() failed, add winfixbuf.res to Makefile
| -rw-r--r-- | src/ex_cmds2.c | 5 | ||||
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test_winfixbuf.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 7233893b17..4b575b4d8c 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -469,15 +469,14 @@ ex_listdo(exarg_T *eap) } if (win_valid(prevwin) && !prevwin->w_p_wfb) - { // 'winfixbuf' is set; attempt to change to a window without it. win_goto(prevwin); - } if (curwin->w_p_wfb) { // Split the window, which will be 'nowinfixbuf', and set curwin to // that - win_split(0, 0); + if (win_split(0, 0) == FAIL) + return; // error message already given if (curwin->w_p_wfb) { diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index d365dfc84f..c4403e67ae 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -558,6 +558,7 @@ NEW_TESTS_RES = \ test_window_cmd.res \ test_window_id.res \ test_windows_home.res \ + test_winfixbuf.res \ test_wordcount.res \ test_writefile.res \ test_xxd.res \ diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim index 8a1862c3e5..edbe2c8f54 100644 --- a/src/testdir/test_winfixbuf.vim +++ b/src/testdir/test_winfixbuf.vim @@ -3248,4 +3248,15 @@ func Test_quickfix_changed_split_failed() augroup! QfChanged endfunc +func Test_bufdo_splitwin_fails() + call s:reset_all_buffers() + let other = s:make_buffer_pairs() + " Make sure there is not enough room to + " split the winfixedbuf window + let &winheight=&lines + let &winminheight=&lines-2 + call assert_fails(':bufdo echo 1', 'E36:') + set winminheight&vim winheight&vim +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index ae5d17a1a8..cf0af43043 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 */ /**/ + 152, +/**/ 151, /**/ 150, |