nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

restore the sensible part of ac268a8340

Browse Source 
We don't want to call event_del() postfork, if cpuworkers are
multiprocess.
This commit is contained in:
Nick Mathewson 2014-08-29 12:21:57 -04:00
parent 4144b4552b
commit b82e166bec
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/connection.c
View File

@ -553,10 +553,17 @@ connection_free_(connection_t *conn)
tor_free(control_conn->incoming_cmd); tor_free(control_conn->incoming_cmd);
} }
#ifdef TOR_IS_MULTITHREADED
/* Probably already freed by connection_free. */ /* 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->read_event);
tor_event_free(conn->write_event); tor_event_free(conn->write_event);
conn->read_event = conn->write_event = NULL; conn->read_event = conn->write_event = NULL;
#endif
IF_HAS_BUFFEREVENT(conn, { IF_HAS_BUFFEREVENT(conn, {
/* This was a workaround to handle bugs in some old versions of libevent /* This was a workaround to handle bugs in some old versions of libevent
* where callbacks can occur after calling bufferevent_free(). Setting * where callbacks can occur after calling bufferevent_free(). Setting