commit 4144b4552b00c25eba9be7a959aa75c1efbe4a18 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 29 11:33:05 2014 -0400 Always event_del() connection events before freeing them Previously, we had done this only in the connection_free() case, but when we called connection_free_() directly from connections_free_all(), we didn't free the connections. --- changes/bug12985 | 4 ++++ src/common/compat_libevent.c | 14 +++++++++++++- src/common/compat_libevent.h | 5 ++--- src/or/connection.c | 6 ++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/changes/bug12985 b/changes/bug12985 new file mode 100644 index 0000000..dc14cdd --- /dev/null +++ b/changes/bug12985 @@ -0,0 +1,4 @@ + o Minor bugfixes (shutdown): + - When shutting down, always call event_del() on lingering read or + write events before freeing them. Fixes bug 12985; bugfix on + 0.1.0.2-rc. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 200a7c6..2a7386d 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -144,13 +144,25 @@ tor_evsignal_new(struct event_base * base, int sig, { return tor_event_new(base, sig, EV_SIGNAL|EV_PERSIST, cb, arg); } -/** Work-alike replacement for event_free() on pre-Libevent-2.0 systems. */ +/** Work-alike replacement for event_free() on pre-Libevent-2.0 systems, + * except tolerate tor_event_free(NULL). */ void tor_event_free(struct event *ev) { + if (ev == NULL) + return; event_del(ev); tor_free(ev); } +#else +/* Wrapper for event_free() that tolerates tor_event_free(NULL) */ +void +tor_event_free(struct event *ev) +{ + if (ev == NULL) + return; + event_free(ev); +} #endif /** Global event base for use by the main thread. */ diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 2472e2c..ab7066b 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -28,11 +28,9 @@ void suppress_libevent_log_msg(const char *msg); #define tor_event_new event_new #define tor_evtimer_new evtimer_new #define tor_evsignal_new evsignal_new -#define tor_event_free event_free #define tor_evdns_add_server_port(sock, tcp, cb, data) \ evdns_add_server_port_with_base(tor_libevent_get_base(), \ (sock),(tcp),(cb),(data)); - #else struct event *tor_event_new(struct event_base * base, evutil_socket_t sock, short what, void (*cb)(evutil_socket_t, short, void *), void *arg); @@ -40,10 +38,11 @@ struct event *tor_evtimer_new(struct event_base * base, void (*cb)(evutil_socket_t, short, void *), void *arg); struct event *tor_evsignal_new(struct event_base * base, int sig, void (*cb)(evutil_socket_t, short, void *), void *arg); -void tor_event_free(struct event *ev); #define tor_evdns_add_server_port evdns_add_server_port #endif +void tor_event_free(struct event *ev); + typedef struct periodic_timer_t periodic_timer_t; periodic_timer_t *periodic_timer_new(struct event_base *base, diff --git a/src/or/connection.c b/src/or/connection.c index 4f74a1d..6d205d1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -553,8 +553,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