diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-07-28 09:50:26 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-07-28 09:50:26 -0400 |
commit | 3205700bc42bd3350defc569709b562a6adff0fd (patch) | |
tree | 8cb6415da1a37ee8e709e89e554e53c934117aab | |
parent | 8c2ccf93709d2a842485d15724d5a3e03eabfe32 (diff) | |
parent | 911e2dc5308d4cbd3f2c7e78e38055cb36c908fb (diff) | |
download | tor-3205700bc42bd3350defc569709b562a6adff0fd.tar.gz tor-3205700bc42bd3350defc569709b562a6adff0fd.zip |
Merge branch 'maint-0.3.1' into release-0.3.1
-rw-r--r-- | changes/bug23053 | 5 | ||||
-rw-r--r-- | src/or/config.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug23053 b/changes/bug23053 new file mode 100644 index 0000000000..082e239409 --- /dev/null +++ b/changes/bug23053 @@ -0,0 +1,5 @@ + o Minor bugfixes (memory leak): + - Fix a small memory leak when validating a configuration that + uses two or more AF_UNIX sockets for the same port type. + Fixes bug 23053; bugfix on 0.2.6.3-alpha. This is CID + 1415725. diff --git a/src/or/config.c b/src/or/config.c index a0ff0e871a..67bf3b9671 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6864,6 +6864,7 @@ parse_port_config(smartlist_t *out, SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp)); smartlist_clear(elts); tor_free(addrport); + tor_free(unix_socket_path); } if (warn_nonlocal && out) { |