Now that sudo_ev_base_free() removes all events before freeing we

don't need to do this by hand.
This commit is contained in:
Todd C. Miller
2013-10-26 07:52:59 -06:00
parent e16c99cd2a
commit d8b368b503
2 changed files with 2 additions and 8 deletions

View File

@@ -494,10 +494,10 @@ sudo_execute(struct command_details *details, struct command_status *cstat)
#endif #endif
/* Free things up. */ /* Free things up. */
sudo_ev_base_free(evbase);
sudo_ev_free(sigfwd_event); sudo_ev_free(sigfwd_event);
sudo_ev_free(signal_event); sudo_ev_free(signal_event);
sudo_ev_free(backchannel_event); sudo_ev_free(backchannel_event);
sudo_ev_base_free(evbase);
TAILQ_FOREACH_SAFE(sigfwd, &sigfwd_list, entries, sigfwd_next) { TAILQ_FOREACH_SAFE(sigfwd, &sigfwd_list, entries, sigfwd_next) {
efree(sigfwd); efree(sigfwd);
} }

View File

@@ -936,13 +936,7 @@ del_io_events(void)
(void) sudo_ev_loop(evbase, SUDO_EVLOOP_NONBLOCK); (void) sudo_ev_loop(evbase, SUDO_EVLOOP_NONBLOCK);
/* Free temporary event base. */ /* Free temporary event base, removing its events. */
SLIST_FOREACH(iob, &iobufs, entries) {
if (iob->revent != NULL)
sudo_ev_del(evbase, iob->revent);
if (iob->wevent != NULL)
sudo_ev_del(evbase, iob->wevent);
}
sudo_ev_base_free(evbase); sudo_ev_base_free(evbase);
debug_return; debug_return;