GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor evmap_{io,signal}_active_() to tolerate bad inputs

Browse Source
This commit is contained in:
Nick Mathewson 2013-12-21 23:15:28 -05:00
parent db7acd1310
commit 974c60e14a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
evmap.c
View File

@ -397,11 +397,13 @@ evmap_io_active_(struct event_base *base, evutil_socket_t fd, short events)
struct event *ev; struct event *ev;
#ifndef EVMAP_USE_HT #ifndef EVMAP_USE_HT
EVUTIL_ASSERT(fd < io->nentries); if (fd < 0 || fd >= io->nentries)
return;
#endif #endif
GET_IO_SLOT(ctx, io, fd, evmap_io); GET_IO_SLOT(ctx, io, fd, evmap_io);
EVUTIL_ASSERT(ctx); if (NULL == ctx)
return;
LIST_FOREACH(ev, &ctx->events, ev_io_next) { LIST_FOREACH(ev, &ctx->events, ev_io_next) {
if (ev->ev_events & events) if (ev->ev_events & events)
event_active_nolock_(ev, ev->ev_events & events, 1); event_active_nolock_(ev, ev->ev_events & events, 1);
@ -472,9 +474,12 @@ evmap_signal_active_(struct event_base *base, evutil_socket_t sig, int ncalls)
struct evmap_signal *ctx; struct evmap_signal *ctx;
struct event *ev; struct event *ev;
EVUTIL_ASSERT(sig < map->nentries); if (sig < 0 || sig >= map->nentries)
return;
GET_SIGNAL_SLOT(ctx, map, sig, evmap_signal); GET_SIGNAL_SLOT(ctx, map, sig, evmap_signal);
if (!ctx)
return;
LIST_FOREACH(ev, &ctx->events, ev_signal_next) LIST_FOREACH(ev, &ctx->events, ev_signal_next)
event_active_nolock_(ev, EV_SIGNAL, ncalls); event_active_nolock_(ev, EV_SIGNAL, ncalls);
} }