cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 13:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

If evsel->del() fails, don't leave the evmap in an inconsistent state.

Browse Source 
This fixes assertion failures in cases where epoll() fails with EBADF
 -- the root cause for which is as of yet unknown. It seems something
 (OpenSSL?) is closing the file descriptor under our feet.
This commit is contained in:
Maxime Henrion 2013-05-16 16:38:39 +00:00 committed by Nick Mathewson
parent 8ab612e396
commit 9b5a527f5b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
evmap.c
View File

@ -375,10 +375,12 @@ evmap_io_del_(struct event_base *base, evutil_socket_t fd, struct event *ev)
if (res) { if (res) {
void *extra = ((char*)ctx) + sizeof(struct evmap_io); void *extra = ((char*)ctx) + sizeof(struct evmap_io);
if (evsel->del(base, ev->ev_fd, old, res, extra) == -1) if (evsel->del(base, ev->ev_fd, old, res, extra) == -1) {
return (-1); retval = -1;
} else {
retval = 1; retval = 1;
} }
}
ctx->nread = nread; ctx->nread = nread;
ctx->nwrite = nwrite; ctx->nwrite = nwrite;