From de4812ea1c9ed9ca69f949411fbdb0c8a0e66eef Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Sat, 10 Jan 2009 13:46:50 +0800 Subject: Fix tevent_common_context_destructor to remove all events instead of just the first one Signed-off-by: Bo Yang Signed-off-by: Stefan Metzmacher --- lib/tevent/tevent.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c index c8b79c669c..fa8219e234 100644 --- a/lib/tevent/tevent.c +++ b/lib/tevent/tevent.c @@ -147,19 +147,25 @@ int tevent_common_context_destructor(struct tevent_context *ev) ev->pipe_fde = NULL; } - for (fd=ev->fd_events; fd; fd = fd->next) { + fd = ev->fd_events; + while (fd) { fd->event_ctx = NULL; DLIST_REMOVE(ev->fd_events, fd); + fd = ev->fd_events; } - for (te=ev->timer_events; te; te = te->next) { + te = ev->timer_events; + while (te) { te->event_ctx = NULL; - DLIST_REMOVE(ev->timer_events, te); + DLIST_REMOVE(te->timer_events, te); + te = ev->timer_events; } - for (se=ev->signal_events; se; se = se->next) { + se = ev->signal_events; + while (se) { se->event_ctx = NULL; DLIST_REMOVE(ev->signal_events, se); + se = ev->signal_events; } return 0; -- cgit