aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Bug 868: check_timers: Don't keep pointers to other timers past timer->func.

Browse Source
This commit is contained in:
Kalle Olavi Niemitalo 2006-12-02 20:53:42 +02:00 committed by Kalle Olavi Niemitalo
parent 45ccd0f0c9
commit 5b9ea6a4ee
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/timer.c
View File

@ -22,6 +22,8 @@ struct timer {
void *data; void *data;
}; };
/* @timers.next points to the timer with the smallest interval,
* @timers.next->next to the second smallest, and so on. */
static INIT_LIST_HEAD(timers); static INIT_LIST_HEAD(timers);
int int
@ -36,7 +38,7 @@ check_timers(timeval_T *last_time)
{ {
timeval_T now; timeval_T now;
timeval_T interval; timeval_T interval;
struct timer *timer, *next; struct timer *timer;
timeval_now(&now); timeval_now(&now);
timeval_sub(&interval, last_time, &now); timeval_sub(&interval, last_time, &now);
@ -45,11 +47,19 @@ check_timers(timeval_T *last_time)
timeval_sub_interval(&timer->interval, &interval); timeval_sub_interval(&timer->interval, &interval);
} }
foreachsafe (timer, next, timers) { while (!list_empty(timers)) {
timer = timers.next;
if (timeval_is_positive(&timer->interval)) if (timeval_is_positive(&timer->interval))
break; break;
del_from_list(timer); del_from_list(timer);
/* At this point, *@timer is to be considered invalid
* outside timers.c; if anything e.g. passes it to
* @kill_timer, that's a bug. However, @timer->func
* and @check_bottom_halves can still call @kill_timer
* on other timers, so this loop must be careful not to
* keep pointers to them. (bug 868) */
timer->func(timer->data); timer->func(timer->data);
mem_free(timer); mem_free(timer);
check_bottom_halves(); check_bottom_halves();