浏览代码

restore the sensible part of ac268a83408e1450544db2f23f364dfa3

We don't want to call event_del() postfork, if cpuworkers are
multiprocess.
Nick Mathewson 9 年之前
父节点
当前提交
b82e166bec
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      src/or/connection.c

+ 7 - 0
src/or/connection.c

@@ -553,10 +553,17 @@ connection_free_(connection_t *conn)
     tor_free(control_conn->incoming_cmd);
   }
 
+#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