nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash when calling stop_timeout from the callback of a repeated timer

Browse source
This commit is contained in:
o9000 2015-07-04 13:34:09 +02:00
parent 290ddc1fea
commit 7cd5c16fca
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/util/timer.c
View file

@ -389,12 +389,19 @@ void callback_multi_timeout(void* arg)
struct timespec cur_time; struct timespec cur_time;
clock_gettime(CLOCK_MONOTONIC, &cur_time); clock_gettime(CLOCK_MONOTONIC, &cur_time);
GSList* it = mth->timeout_list; GSList* it = mth->timeout_list;
start:
while (it) { while (it) {
timeout* t = it->data; timeout* t = it->data;
if (++t->multi_timeout->current_count >= t->multi_timeout->count_to_expiration) { if (++t->multi_timeout->current_count >= t->multi_timeout->count_to_expiration) {
t->_callback(t->arg); t->_callback(t->arg);
t->multi_timeout->current_count = 0; if (multi_timeouts && g_hash_table_lookup(multi_timeouts, t)) {
t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec); // Timer still exists
t->multi_timeout->current_count = 0;
t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
} else {
it = mth->timeout_list;
goto start;
}
} }
it = it->next; it = it->next;
} }