thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.2332

Browse Source 
Problem:    Crash when stop_timer() is called in a callback of a callback.
            Vim hangs when the timer callback uses too much time.
Solution:   Set tr_id to -1 when a timer is to be deleted. Don't keep calling
            callbacks forever. (Ozaki Kiichi)
This commit is contained in:
Bram Moolenaar
2016-09-05 22:45:28 +02:00
parent 33a80eeb85
commit 75537a93e9
6 changed files with 131 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/evalfunc.c
View File

@@ -12398,12 +12398,14 @@ f_timer_pause(typval_T *argvars, typval_T *rettv UNUSED)
static void
f_timer_start(typval_T *argvars, typval_T *rettv)
{
long msec = (long)get_tv_number(&argvars[0]);
timer_T *timer;
int repeat = 0;
char_u *callback;
dict_T *dict;
long msec = (long)get_tv_number(&argvars[0]);
timer_T *timer;
int repeat = 0;
char_u *callback;
dict_T *dict;
partial_T *partial;
rettv->vval.v_number = -1;
if (check_secure())
return;
if (argvars[2].v_type != VAR_UNKNOWN)
@@ -12418,13 +12420,13 @@ f_timer_start(typval_T *argvars, typval_T *rettv)
repeat = get_dict_number(dict, (char_u *)"repeat");
}
timer = create_timer(msec, repeat);
callback = get_callback(&argvars[1], &timer->tr_partial);
callback = get_callback(&argvars[1], &partial);
if (callback == NULL)
{
stop_timer(timer);
rettv->vval.v_number = -1;
}
return;
timer = create_timer(msec, repeat);
if (timer == NULL)
free_callback(callback, partial);
else
{
if (timer->tr_partial == NULL)
@@ -12432,7 +12434,8 @@ f_timer_start(typval_T *argvars, typval_T *rettv)
else
/* pointer into the partial */
timer->tr_callback = callback;
rettv->vval.v_number = timer->tr_id;
timer->tr_partial = partial;
rettv->vval.v_number = (varnumber_T)timer->tr_id;
}
}