mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug4697'

Browse source
This commit is contained in:
Nick Mathewson 2011-12-22 09:45:26 -05:00
commit 878a684386
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/bug4697 Normal file
View file

@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix an assertion failure when, while running with bufferevents, a
connection finishes connecting after it is marked for close, but
before it is closed. Fix for bug 4697; Bugfix on 0.2.3.1-alpha.

3
src/or/connection.c
View file

@ -2953,6 +2953,9 @@ connection_handle_event_cb(struct bufferevent *bufev, short event, void *arg)
{
connection_t *conn = arg;
(void) bufev;
if (conn->marked_for_close)
return;
if (event & BEV_EVENT_CONNECTED) {
tor_assert(connection_state_is_connecting(conn));
if (connection_finished_connecting(conn)<0)