vim-patch:9.1.0065: Segfault with CompleteChanged autocommand (#27261)

Problem:  Segfault with CompleteChanged autocommand
          (markonm )
Solution: Test match->cp_prev for being NULL before accessing it

closes: vim/vim#13929

fef6630166

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-01-30 07:34:37 +08:00 committed by GitHub
parent be5cf33836
commit a2070ba877
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 6 deletions

View File

@ -2760,9 +2760,11 @@ static int info_add_completion_info(list_T *li)
// Skip the element with the CP_ORIGINAL_TEXT flag at the beginning, in case of // Skip the element with the CP_ORIGINAL_TEXT flag at the beginning, in case of
// forward completion, or at the end, in case of backward completion. // forward completion, or at the end, in case of backward completion.
match = forward ? match->cp_next match = (forward || match->cp_prev == NULL
: (compl_no_select && match_at_original_text(match) ? match->cp_next
? match->cp_prev : match->cp_prev->cp_prev); : (compl_no_select && match_at_original_text(match)
? match->cp_prev
: match->cp_prev->cp_prev));
while (match != NULL && !match_at_original_text(match)) { while (match != NULL && !match_at_original_text(match)) {
dict_T *di = tv_dict_alloc(); dict_T *di = tv_dict_alloc();

View File

@ -1078,7 +1078,24 @@ describe('completion', function()
]]) ]])
end) end)
it('does not crash if text is changed by first call to complete function #17489', function() -- oldtest: Test_complete_changed_complete_info()
it('no crash calling complete_info() in CompleteChanged', function()
source([[
set completeopt=menuone
autocmd CompleteChanged * call complete_info(['items'])
call feedkeys("iii\<cr>\<c-p>")
]])
screen:expect([[
ii |
ii^ |
{2:ii }{0: }|
{0:~ }|*4
{3:-- Keyword completion (^N^P) The only match} |
]])
assert_alive()
end)
it('no crash if text changed by first call to complete function #17489', function()
source([[ source([[
func Complete(findstart, base) abort func Complete(findstart, base) abort
if a:findstart if a:findstart
@ -1097,7 +1114,7 @@ describe('completion', function()
assert_alive() assert_alive()
end) end)
it('does not crash when using i_CTRL-X_CTRL-V to complete non-existent colorscheme', function() it('no crash using i_CTRL-X_CTRL-V to complete non-existent colorscheme', function()
feed('icolorscheme NOSUCHCOLORSCHEME<C-X><C-V>') feed('icolorscheme NOSUCHCOLORSCHEME<C-X><C-V>')
expect('colorscheme NOSUCHCOLORSCHEME') expect('colorscheme NOSUCHCOLORSCHEME')
assert_alive() assert_alive()

View File

@ -2407,4 +2407,18 @@ func Test_complete_info_index()
bwipe! bwipe!
endfunc endfunc
" vim: shiftwidth=2 sts=2 expandtab func Test_complete_changed_complete_info()
CheckRunVimInTerminal
" this used to crash vim, see #13929
let lines =<< trim END
set completeopt=menuone
autocmd CompleteChanged * call complete_info(['items'])
call feedkeys("iii\<cr>\<c-p>")
END
call writefile(lines, 'Xsegfault', 'D')
let buf = RunVimInTerminal('-S Xsegfault', #{rows: 5})
call WaitForAssert({-> assert_match('^ii', term_getline(buf, 1))}, 1000)
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable