diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-07 11:55:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-07 11:55:50 -0500 |
| commit | 1abd526c75eade83318a6ec6aff84d5f0f079a3b (patch) | |
| tree | 986f36c1d16ff167b68b6b6674acf93202d86773 /src/common | |
| parent | 7dd852835c24a2db1cc4751f3b9235a8c78bf775 (diff) | |
| parent | 139a1c64a0333d7a2af6715e827d5858628683f4 (diff) | |
| download | tor-1abd526c75eade83318a6ec6aff84d5f0f079a3b.tar.gz tor-1abd526c75eade83318a6ec6aff84d5f0f079a3b.zip | |
Merge remote-tracking branch 'public/bug12985_025'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat_libevent.c | 14 | ||||
| -rw-r--r-- | src/common/compat_libevent.h | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 6a8281d35f..15308dd4cb 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -146,13 +146,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 9296851132..69259e7ed6 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, |