mirror of
https://github.com/neovim/neovim.git
synced 2025-09-29 14:38:32 +00:00
vim-patch:9.0.1857: [security] heap-use-after-free in is_qf_win()
Problem: heap-use-after-free in is_qf_win()
Solution: Check buffer is valid before accessing it
fc68299d43
Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -698,7 +698,7 @@ void getout(int exitval)
|
||||
for (const tabpage_T *tp = first_tabpage; tp != NULL; tp = next_tp) {
|
||||
next_tp = tp->tp_next;
|
||||
FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
|
||||
if (wp->w_buffer == NULL) {
|
||||
if (wp->w_buffer == NULL || !buf_valid(wp->w_buffer)) {
|
||||
// Autocmd must have close the buffer already, skip.
|
||||
continue;
|
||||
}
|
||||
|
@@ -262,10 +262,8 @@ static const char *e_current_location_list_was_changed =
|
||||
#define IS_QF_LIST(qfl) ((qfl)->qfl_type == QFLT_QUICKFIX)
|
||||
#define IS_LL_LIST(qfl) ((qfl)->qfl_type == QFLT_LOCATION)
|
||||
|
||||
//
|
||||
// Return location list for window 'wp'
|
||||
// For location list window, return the referenced location list
|
||||
//
|
||||
#define GET_LOC_LIST(wp) (IS_LL_WINDOW(wp) ? (wp)->w_llist_ref : (wp)->w_llist)
|
||||
|
||||
// Macro to loop through all the items in a quickfix list
|
||||
@@ -3863,13 +3861,11 @@ static bool qf_win_pos_update(qf_info_T *qi, int old_qf_index)
|
||||
static int is_qf_win(const win_T *win, const qf_info_T *qi)
|
||||
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
|
||||
{
|
||||
//
|
||||
// A window displaying the quickfix buffer will have the w_llist_ref field
|
||||
// set to NULL.
|
||||
// A window displaying a location list buffer will have the w_llist_ref
|
||||
// pointing to the location list.
|
||||
//
|
||||
if (bt_quickfix(win->w_buffer)) {
|
||||
if (buf_valid(win->w_buffer) && bt_quickfix(win->w_buffer)) {
|
||||
if ((IS_QF_STACK(qi) && win->w_llist_ref == NULL)
|
||||
|| (IS_LL_STACK(qi) && win->w_llist_ref == qi)) {
|
||||
return true;
|
||||
|
9
test/old/testdir/crash/bt_quickfix_poc
Normal file
9
test/old/testdir/crash/bt_quickfix_poc
Normal file
@@ -0,0 +1,9 @@
|
||||
comman!-narg=* Xexpr <mods>lex<args>
|
||||
auto BufReadPre * exe"sn" ..expand("<abuf>")
|
||||
fu Xautocmd_changelist()
|
||||
cal writefile(['Xtestfile2:4:4'],'Xerr')
|
||||
sil! edi Xerr
|
||||
Xexpr 'Xtestfile:4:4'
|
||||
endf
|
||||
call Xautocmd_changelist()
|
||||
call Xautocmd_changelist()
|
@@ -5,38 +5,58 @@ source screendump.vim
|
||||
CheckScreendump
|
||||
|
||||
func Test_crash1()
|
||||
if !executable('sh')
|
||||
throw 'Skipped: sh not executable!'
|
||||
endif
|
||||
" The following used to crash Vim
|
||||
" let opts = #{wait_for_ruler: 0, rows: 20, cmd: 'sh'}
|
||||
let opts = #{cmd: 'sh'}
|
||||
let args = 'bash'
|
||||
let vim = GetVimProg()
|
||||
|
||||
let buf = RunVimInTerminal(args, opts)
|
||||
let buf = RunVimInTerminal('sh', opts)
|
||||
|
||||
let file = 'crash/poc_huaf1'
|
||||
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
|
||||
let args = printf(cmn_args, vim, file)
|
||||
call term_sendkeys(buf, args ..
|
||||
\ ' && echo "crash 1: [OK]" >> X_crash1_result.txt' .. "\<cr>")
|
||||
\ ' && echo "crash 1: [OK]" > X_crash1_result.txt' .. "\<cr>")
|
||||
call TermWait(buf, 50)
|
||||
|
||||
let file = 'crash/poc_huaf2'
|
||||
let args = printf(cmn_args, vim, file)
|
||||
call term_sendkeys(buf, args ..
|
||||
\ ' && echo "crash 2: [OK]" >> X_crash1_result.txt' .. "\<cr>")
|
||||
call TermWait(buf, 50)
|
||||
|
||||
let file = 'crash/poc_huaf3'
|
||||
let args = printf(cmn_args, vim, file)
|
||||
call term_sendkeys(buf, args ..
|
||||
\ ' && echo "crash 3: [OK]" >> X_crash1_result.txt' .. "\<cr>")
|
||||
call TermWait(buf, 100)
|
||||
|
||||
call TermWait(buf, 50)
|
||||
let file = 'crash/bt_quickfix_poc'
|
||||
let args = printf(cmn_args, vim, file)
|
||||
call term_sendkeys(buf, args ..
|
||||
\ ' && echo "crash 4: [OK]" >> X_crash1_result.txt' .. "\<cr>")
|
||||
" clean up
|
||||
call delete('Xerr')
|
||||
|
||||
" This test takes a bit longer
|
||||
call TermWait(buf, 200)
|
||||
|
||||
" clean up
|
||||
call delete('Xerr')
|
||||
exe buf .. "bw!"
|
||||
|
||||
sp X_crash1_result.txt
|
||||
call assert_equal(['crash 1: [OK]', 'crash 2: [OK]', 'crash 3: [OK]'],
|
||||
\ getline(1, '$'))
|
||||
|
||||
let expected = [
|
||||
\ 'crash 1: [OK]',
|
||||
\ 'crash 2: [OK]',
|
||||
\ 'crash 3: [OK]',
|
||||
\ 'crash 4: [OK]',
|
||||
\ ]
|
||||
|
||||
call assert_equal(expected, getline(1, '$'))
|
||||
bw!
|
||||
|
||||
call delete('X_crash1_result.txt')
|
||||
|
Reference in New Issue
Block a user