From bd6999b4a2b60fdd4e2e317ca84d382f2b9b0ace Mon Sep 17 00:00:00 2001 From: Niels Provos Date: Tue, 14 Dec 2004 03:36:12 +0000 Subject: fix issue where event_del is called before event_set. bad bad thing to do. pointed out by Mark Kidwell svn:r128 --- event.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/event.c b/event.c index f1b8b361..45d91a4a 100644 --- a/event.c +++ b/event.c @@ -591,13 +591,21 @@ event_add(struct event *ev, struct timeval *tv) int event_del(struct event *ev) { - struct event_base *base = ev->ev_base; - const struct eventop *evsel = base->evsel; - void *evbase = base->evbase; + struct event_base *base; + const struct eventop *evsel; + void *evbase; LOG_DBG((LOG_MISC, 80, "event_del: %p, callback %p", ev, ev->ev_callback)); + /* An event without a base has not been added */ + if (ev->ev_base == NULL) + return; + + base = ev->ev_base; + evsel = base->evsel; + evbase = base->evbase; + assert(!(ev->ev_flags & ~EVLIST_ALL)); /* See if we are just active executing this event in a loop */ -- cgit v1.2.1