diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-07 11:55:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-07 11:55:50 -0500 |
| commit | 1abd526c75eade83318a6ec6aff84d5f0f079a3b (patch) | |
| tree | 986f36c1d16ff167b68b6b6674acf93202d86773 /src/or | |
| parent | 7dd852835c24a2db1cc4751f3b9235a8c78bf775 (diff) | |
| parent | 139a1c64a0333d7a2af6715e827d5858628683f4 (diff) | |
| download | tor-1abd526c75eade83318a6ec6aff84d5f0f079a3b.tar.gz tor-1abd526c75eade83318a6ec6aff84d5f0f079a3b.zip | |
Merge remote-tracking branch 'public/bug12985_025'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index c77d29b536..c67cc3c111 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -574,8 +574,10 @@ connection_free_(connection_t *conn) tor_free(control_conn->incoming_cmd); } - tor_free(conn->read_event); /* Probably already freed by connection_free. */ - tor_free(conn->write_event); /* Probably already freed by connection_free. */ + /* Probably already freed by connection_free. */ + tor_event_free(conn->read_event); + tor_event_free(conn->write_event); + conn->read_event = conn->write_event = NULL; IF_HAS_BUFFEREVENT(conn, { /* This was a workaround to handle bugs in some old versions of libevent * where callbacks can occur after calling bufferevent_free(). Setting |