adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.4229: possible crash when invoking timer callback fails

Browse Source 
Problem:    Possible crash when invoking timer callback fails.
Solution:   Initialize the typval.  Give an error for an empty callback.
            (closes #9636)
This commit is contained in:
Bram Moolenaar
2022-01-27 13:55:35 +00:00
parent b0ad2d92fd
commit 745b938a48
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/time.c
View File

@ -481,6 +481,7 @@ timer_callback(timer_T *timer)
argv[0].vval.v_number = (varnumber_T)timer->tr_id;
argv[1].v_type = VAR_UNKNOWN;
rettv.v_type = VAR_UNKNOWN;
call_callback(&timer->tr_callback, -1, &rettv, 1, argv);
clear_tv(&rettv);
}
@ -854,6 +855,13 @@ f_timer_start(typval_T *argvars, typval_T *rettv)
callback = get_callback(&argvars[1]);
if (callback.cb_name == NULL)
return;
if (in_vim9script() && *callback.cb_name == NUL)
{
// empty callback is not useful for a timer
emsg(_(e_invalid_callback_argument));
free_callback(&callback);
return;
}
timer = create_timer(msec, repeat);
if (timer == NULL)