diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-29 12:24:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-29 12:24:52 -0400 |
| commit | b0138cd05540001f084b7bd828b3dcffbaeb5b22 (patch) | |
| tree | 2c72638364925302b6fe3c6225c5cef9ddaaf8f7 /src/or/connection.c | |
| parent | 37a76d75dd38a1ebd45627bb6e29e40f60917188 (diff) | |
| parent | b82e166bec5fcc468424af1ff71e2e753ac534a2 (diff) | |
| download | tor-b0138cd05540001f084b7bd828b3dcffbaeb5b22.tar.gz tor-b0138cd05540001f084b7bd828b3dcffbaeb5b22.zip | |
Merge remote-tracking branch 'public/bug12985_024' into bug12984_025
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 4788bdf950..bcb17376c0 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -575,8 +575,17 @@ 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. */ +#ifdef TOR_IS_MULTITHREADED + /* Probably already freed by connection_free. */ + /* We don't do these frees on the multiprocess case, since in that case we + * don't want to call event_del() postfork or it's likely to mess up. + * Multiprocess builds are deprecated, so let's just have a one-time memory + * leak here. + */ + tor_event_free(conn->read_event); + tor_event_free(conn->write_event); + conn->read_event = conn->write_event = NULL; +#endif 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 |