tor

commit 6252e04a37c8d23e2e6164d20a566fad743a1a37
parent baf53300d731c1e047dca217b69bfa372f310d57
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 28 Jul 2017 09:50:26 -0400

Merge branch 'maint-0.3.1'

Diffstat:
A
changes/bug23053
 | 
5
+++++
M
src/or/config.c
 | 
1
+

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug23053 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
@@ -6869,6 +6869,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) {