summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-28 09:50:16 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-28 09:50:16 -0400
commit911e2dc5308d4cbd3f2c7e78e38055cb36c908fb (patch)
treee03a214a3c23dd479f98c3b7d99d02941100d334
parentaf3079a492ef1611422f97c72fe07426931830d1 (diff)
parent9a0f38a349293f188a81b86d5b7639175a1cf334 (diff)
downloadtor-911e2dc5308d4cbd3f2c7e78e38055cb36c908fb.tar.gz
tor-911e2dc5308d4cbd3f2c7e78e38055cb36c908fb.zip
Merge branch 'bug23053_029' into maint-0.3.1
-rw-r--r--changes/bug230535
-rw-r--r--src/or/config.c1
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) {