0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

patch 9.0.1763: crash when passing invalid buffer to undotree()

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

closes: #12862
closes: #12830

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
zeertzjq
2023-08-20 18:35:10 +02:00
committed by Christian Brabandt
parent f9037f186a
commit ab9f2ecfd4
3 changed files with 21 additions and 12 deletions

View File

@@ -3726,23 +3726,18 @@ u_undofile_reset_and_delete(buf_T *buf)
void
f_undotree(typval_T *argvars UNUSED, typval_T *rettv)
{
typval_T *tv = &argvars[0];
buf_T *buf;
dict_T *dict;
list_T *list;
if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL)
return;
if (tv->v_type == VAR_UNKNOWN)
buf = curbuf;
else
buf = tv_get_buf_from_arg(tv);
if (rettv_dict_alloc(rettv) == FAIL)
return;
dict = rettv->vval.v_dict;
typval_T *tv = &argvars[0];
buf_T *buf = tv->v_type == VAR_UNKNOWN ? curbuf : get_buf_arg(tv);
if (buf == NULL)
return;
dict_T *dict = rettv->vval.v_dict;
dict_add_number(dict, "synced", (long)buf->b_u_synced);
dict_add_number(dict, "seq_last", buf->b_u_seq_last);
@@ -3751,7 +3746,7 @@ f_undotree(typval_T *argvars UNUSED, typval_T *rettv)
dict_add_number(dict, "time_cur", (long)buf->b_u_time_cur);
dict_add_number(dict, "save_cur", buf->b_u_save_nr_cur);
list = list_alloc();
list_T *list = list_alloc();
if (list != NULL)
{
u_eval_tree(buf, buf->b_u_oldhead, list);