forked from aniani/vim
patch 9.1.0130: [security]: UAF if win_split_ins autocommands delete "wp"
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>
This commit is contained in:
committed by
Christian Brabandt
parent
f548ae7b63
commit
abf7030a5c
@@ -1191,6 +1191,15 @@ func Test_win_splitmove()
|
|||||||
call assert_equal(v:true, s:triggered)
|
call assert_equal(v:true, s:triggered)
|
||||||
unlet! 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
|
au! WinSplitMove
|
||||||
augroup! WinSplitMove
|
augroup! WinSplitMove
|
||||||
%bw!
|
%bw!
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
130,
|
||||||
/**/
|
/**/
|
||||||
129,
|
129,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -1954,7 +1954,8 @@ win_splitmove(win_T *wp, int size, int flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If splitting horizontally, try to preserve height.
|
// 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);
|
win_setheight_win(height, wp);
|
||||||
if (p_ea)
|
if (p_ea)
|
||||||
|
Reference in New Issue
Block a user