diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-11-15 15:09:33 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-11-15 15:09:33 -0500 |
commit | 67c62394bc0c8a1c7beb689908b968af454a828a (patch) | |
tree | eee01629d7698ce4925339fcf8722ff98a8a2088 | |
parent | ae8683621add4b7fe68ba82f76b231ef8551477f (diff) | |
parent | f28559fd2a70ae8e30477c3d6fa2ffc499a63e34 (diff) | |
download | tor-67c62394bc0c8a1c7beb689908b968af454a828a.tar.gz tor-67c62394bc0c8a1c7beb689908b968af454a828a.zip |
Merge branch 'bug24279_030' into maint-0.3.2
-rw-r--r-- | changes/bug24279 | 4 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 0000000000..b2d5698bb7 --- /dev/null +++ b/changes/bug24279 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, hardening): + - Fix a memory leak warning in one of the libevent-related + configuration tests that could occur when manually specifying + -fsanitize=address. Fixes bug 24279; bugfix on 0.3.0.2-alpha. diff --git a/configure.ac b/configure.ac index c92118f732..dd7dcbc87c 100644 --- a/configure.ac +++ b/configure.ac @@ -624,7 +624,7 @@ struct event_base *event_base_new(void);], #ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif -event_base_new(); +event_base_free(event_base_new()); ], [--with-libevent-dir], [/opt/libevent]) dnl Determine the incantation needed to link libevent. |