diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-29 12:24:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-29 12:24:52 -0400 |
| commit | b0138cd05540001f084b7bd828b3dcffbaeb5b22 (patch) | |
| tree | 2c72638364925302b6fe3c6225c5cef9ddaaf8f7 /src/common/compat_libevent.c | |
| parent | 37a76d75dd38a1ebd45627bb6e29e40f60917188 (diff) | |
| parent | b82e166bec5fcc468424af1ff71e2e753ac534a2 (diff) | |
| download | tor-b0138cd05540001f084b7bd828b3dcffbaeb5b22.tar.gz tor-b0138cd05540001f084b7bd828b3dcffbaeb5b22.zip | |
Merge remote-tracking branch 'public/bug12985_024' into bug12984_025
Diffstat (limited to 'src/common/compat_libevent.c')
| -rw-r--r-- | src/common/compat_libevent.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 74b54bb855..5d9846cca4 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. */ |