summaryrefslogtreecommitdiff
path: root/bufferevent.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-08-17 13:26:03 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-17 13:26:03 -0400
commitda6e7cd49588f6149166e05e7b7b725b360ab72c (patch)
treec99d6eaf6aaa8b2add3924a1f0c38678d6ff4e03 /bufferevent.c
parent5fb10958249a89b2e7f3711fe0eed624086c5336 (diff)
downloadlibevent-da6e7cd49588f6149166e05e7b7b725b360ab72c.tar.gz
Correctly detect failure to delete bufferevent read-timeout event
Gilad Benjamini noted that we check the error code for deleting a write-timeout event twice, and the read timeout not at all. This shouldn't be a bit problem, since it's really hard for a delete to fail on a timeout-only event, but it's worth fixing. Fixes bug 3046787
Diffstat (limited to 'bufferevent.c')
-rw-r--r--bufferevent.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bufferevent.c b/bufferevent.c
index 9080c5e2..9923bbe0 100644
--- a/bufferevent.c
+++ b/bufferevent.c
@@ -788,7 +788,7 @@ _bufferevent_del_generic_timeout_cbs(struct bufferevent *bev)
int r1,r2;
r1 = event_del(&bev->ev_read);
r2 = event_del(&bev->ev_write);
- if (r2<0 || r2<0)
+ if (r1<0 || r2<0)
return -1;
return 0;
}