diff options
| author | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-02-24 10:20:24 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-24 10:20:24 +0100 |
| commit | abf7030a5c22257f066fa9c4061ad150d5a82577 (patch) | |
| tree | 184d5d96f930bd0bb36324b8943cd34749332bfe | |
| parent | f548ae7b6357c7934411df243bc987800c9b76d1 (diff) | |
patch 9.1.0130: [security]: UAF if win_split_ins autocommands delete "wp"v9.1.0130
Problem: heap-use-after-free in win_splitmove if Enter/Leave
autocommands from win_split_ins immediately closes "wp".
Solution: check that "wp" is valid after win_split_ins.
(Sean Dewar)
closes: #14078
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index a70fb790c5..917c43203c 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1191,6 +1191,15 @@ func Test_win_splitmove() call assert_equal(v:true, s:triggered) unlet! s:triggered + split + let close_win = winnr('#') + augroup WinSplitMove + au! + au WinEnter * ++once quit! + augroup END + call win_splitmove(close_win, winnr()) + call assert_equal(0, win_id2win(close_win)) + au! WinSplitMove augroup! WinSplitMove %bw! diff --git a/src/version.c b/src/version.c index 3ea94ee92a..b6e25e665a 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 */ /**/ + 130, +/**/ 129, /**/ 128, diff --git a/src/window.c b/src/window.c index 66a1d7de41..7123780c52 100644 --- a/src/window.c +++ b/src/window.c @@ -1954,7 +1954,8 @@ win_splitmove(win_T *wp, int size, int flags) } // If splitting horizontally, try to preserve height. - if (size == 0 && !(flags & WSP_VERT)) + // Note that win_split_ins autocommands may have immediately closed "wp"! + if (size == 0 && !(flags & WSP_VERT) && win_valid(wp)) { win_setheight_win(height, wp); if (p_ea) |