Merge branch 'maint-0.3.1' into release-0.3.1

2017-07-28 09:50:26 -04:00 · 2017-07-28 09:50:26 -04:00 · 3205700bc4
parent 8c2ccf9370 911e2dc530
commit 3205700bc4
2 changed files with 6 additions and 0 deletions
--- 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.
--- 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) {