mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 23:05:17 +00:00
Code Issues Releases Wiki Activity

Don't call sudo_ev_{add,del}_impl() for timeout-only events. This

Browse Source 
makes it possible to pass sudo_ev_alloc() an fd of -1 for events
only use SUDO_EV_TIMEOUT.
This commit is contained in:
Todd C. Miller
2013-11-01 16:54:49 -06:00
parent adef363d00
commit 1a548a5dda
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/event.c
View File

@@ -143,8 +143,10 @@ sudo_ev_add(struct sudo_event_base *base, struct sudo_event *ev,
/* Add event to the base. */ /* Add event to the base. */
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: adding event %p to base %p", sudo_debug_printf(SUDO_DEBUG_INFO, "%s: adding event %p to base %p",
__func__, ev, base); __func__, ev, base);
if (sudo_ev_add_impl(base, ev) != 0) if (ev->events & (SUDO_EV_READ|SUDO_EV_WRITE)) {
debug_return_int(-1); if (sudo_ev_add_impl(base, ev) != 0)
debug_return_int(-1);
}
ev->base = base; ev->base = base;
if (tohead) { if (tohead) {
TAILQ_INSERT_HEAD(&base->events, ev, entries); TAILQ_INSERT_HEAD(&base->events, ev, entries);
@@ -208,8 +210,10 @@ sudo_ev_del(struct sudo_event_base *base, struct sudo_event *ev)
__func__, ev, base); __func__, ev, base);
/* Call backend. */ /* Call backend. */
if (sudo_ev_del_impl(base, ev) != 0) if (ev->events & (SUDO_EV_READ|SUDO_EV_WRITE)) {
debug_return_int(-1); if (sudo_ev_del_impl(base, ev) != 0)
debug_return_int(-1);
}
/* Unlink from event list. */ /* Unlink from event list. */
TAILQ_REMOVE(&base->events, ev, entries); TAILQ_REMOVE(&base->events, ev, entries);