Always defer bufferevent_openssl callbacks to avoid reentrant invocations

diff --git a/src/common/tortls.c b/src/common/tortls.c
index d9f1d875d2368f594bd19d3f30e97589117596db..bd6840af70dc5746c0ccfc40d04cec7321538f6f 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1710,12 +1710,16 @@ tor_tls_init_bufferevent(tor_tls_t *tls, struct bufferevent *bufev_in,
     bufferevent_free(bufev_in);
   }
   tls->state = TOR_TLS_ST_BUFFEREVENT;
+
+  /* Current versions (as of 2.0.7-rc) of Libevent need to defer
+   * bufferevent_openssl callbacks, or else our callback functions will
+   * get called reentrantly, which is bad for us.
+   */
   out = bufferevent_openssl_socket_new(tor_libevent_get_base(),
                                        socket,
                                        tls->ssl,
                                        state,
-                                       0);
-                                       //BEV_OPT_DEFER_CALLBACKS);
+                                       BEV_OPT_DEFER_CALLBACKS);
 #endif
   return out;
 }