pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-01 10:26:37 +02:00
Code Activity

Update DoEvents() so it is safe to call EventDel() from within

Browse Source 
an event handler. Until now it was NOT safe. Now it is.
This commit is contained in:
Bram Matthys
2020-01-04 16:54:48 +01:00
parent bb82138466
commit d29a55a8db
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api-event.c
+14 -13
View File
@@ -155,24 +155,25 @@ int EventMod(Event *event, EventInfo *mods)
void DoEvents(void)
{
Event *eventptr;
Event temp;
Event *e, *e_next;
for (eventptr = events; eventptr; eventptr = eventptr->next)
for (e = events; e; e = e_next)
{
if (eventptr->count == -1)
goto freeit;
if ((eventptr->every_msec == 0) || minimum_msec_since_last_run(&eventptr->last_run, eventptr->every_msec))
e_next = e->next;
if (e->count == -1)
{
(*eventptr->event)(eventptr->data);
if (eventptr->count > 0)
EventDel(e);
continue;
}
if ((e->every_msec == 0) || minimum_msec_since_last_run(&e->last_run, e->every_msec))
{
(*e->event)(e->data);
if (e->count > 0)
{
eventptr->count--;
if (eventptr->count == 0)
e->count--;
if (e->count == 0)
{
freeit:
temp.next = EventDel(eventptr);
eventptr = &temp;
EventDel(e);
continue;
}
}