IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1763: crash when passing invalid buffer to undotree() (#24807)

Browse Source 
Problem:  crash when passing invalid buffer to undotree()
Solution: Use get_buf_arg() instead of tv_get_buf_from_arg().

closes: vim/vim#12862
closes: vim/vim#12830

ab9f2ecfd4
This commit is contained in:
zeertzjq 2023-08-21 07:20:26 +08:00 committed by GitHub
parent d21e6285e9
commit ac99e63d73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/undo.c
View File

@ -3171,11 +3171,14 @@ void f_undofile(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// "undotree(expr)" function
void f_undotree(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
typval_T *const tv = &argvars[0];
buf_T *const buf = tv->v_type == VAR_UNKNOWN ? curbuf : tv_get_buf_from_arg(tv);
tv_dict_alloc_ret(rettv);
typval_T *const tv = &argvars[0];
buf_T *const buf = tv->v_type == VAR_UNKNOWN ? curbuf : get_buf_arg(tv);
if (buf == NULL) {
return;
}
dict_T *dict = rettv->vval.v_dict;
tv_dict_add_nr(dict, S_LEN("synced"), (varnumber_T)buf->b_u_synced);

12
test/old/testdir/test_undo.vim
View File

@ -134,6 +134,18 @@ func Test_undotree_bufnr()
call assert_notequal(d1, d)
call assert_equal(d2, d)
" error cases
call assert_fails('call undotree(-1)', 'E158:')
call assert_fails('call undotree("nosuchbuf")', 'E158:')
" after creating a buffer nosuchbuf, undotree('nosuchbuf') should
" not error out
new nosuchbuf
let d = {'seq_last': 0, 'entries': [], 'time_cur': 0, 'save_last': 0, 'synced': 1, 'save_cur': 0, 'seq_cur': 0}
call assert_equal(d, undotree("nosuchbuf"))
" clean up
bw nosuchbuf
" Drop created windows
set ul&
new