diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-15 15:11:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-15 15:11:30 -0500 |
| commit | 8ff60b52889ecd40aa8311171bac619b0598da9b (patch) | |
| tree | 8aedd8b03c3c2d0116d6ed45f46d4c6749a4a749 | |
| parent | ceeacc734da441051e8c3cfbab420b7083af89b7 (diff) | |
| parent | 56b7407a9096eeed8af1b45bda5a149e7ffabb2c (diff) | |
| download | tor-8ff60b52889ecd40aa8311171bac619b0598da9b.tar.gz tor-8ff60b52889ecd40aa8311171bac619b0598da9b.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | changes/bug24279 | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 0000000000..ab2932b341 --- /dev/null +++ b/changes/bug24279 @@ -0,0 +1,5 @@ + 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. + Found and patched by Alex Xu. diff --git a/configure.ac b/configure.ac index 998bb914b3..93b18a326a 100644 --- a/configure.ac +++ b/configure.ac @@ -625,7 +625,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. |