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

Merge pull request #189 from azat/be_async-avoid-doule-close

Browse Source 
be async: avoid double close()
This commit is contained in:
Nick Mathewson 2014-11-24 01:09:13 -05:00
commit 5ebad45e2d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bufferevent_async.c
View File

@ -381,9 +381,10 @@ be_async_destruct(struct bufferevent *bev)
bev_async_del_write(bev_async); bev_async_del_write(bev_async);
fd = evbuffer_overlapped_get_fd_(bev->input); fd = evbuffer_overlapped_get_fd_(bev->input);
if (bev_p->options & BEV_OPT_CLOSE_ON_FREE) { if (fd != (evutil_socket_t)INVALID_SOCKET &&
/* XXXX possible double-close */ (bev_p->options & BEV_OPT_CLOSE_ON_FREE)) {
evutil_closesocket(fd); evutil_closesocket(fd);
evbuffer_overlapped_set_fd_(bev->input, INVALID_SOCKET);
} }
} }
@ -671,6 +672,7 @@ be_async_ctrl(struct bufferevent *bev, enum bufferevent_ctrl_op op,
if (fd != (evutil_socket_t)INVALID_SOCKET && if (fd != (evutil_socket_t)INVALID_SOCKET &&
(bev_a->bev.options & BEV_OPT_CLOSE_ON_FREE)) { (bev_a->bev.options & BEV_OPT_CLOSE_ON_FREE)) {
closesocket(fd); closesocket(fd);
evbuffer_overlapped_set_fd_(bev->input, INVALID_SOCKET);
} }
bev_a->ok = 0; bev_a->ok = 0;
return 0; return 0;