tor

commit 4b599aaae4fc33460553306a8bba41d777558420
parent 4587e67dfd29f62ced4c52c18d2c2b7e1538080b
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 24 Apr 2019 09:43:28 -0400

Merge branch 'tor-github/pr/939'

Diffstat:
A
changes/bug30151
 | 
5
+++++
M
src/tools/tor-resolve.c
 | 
1
+

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug30151 b/changes/bug30151
@@ -0,0 +1,5 @@
+  o Minor bugfixes (tor-resolve):
+    - Fix a memory leak in tor-resolve that could happen if Tor gave it a
+      malformed SOCKS response.  (Memory leaks in tor-resolve don't actually
+      matter, but it's good to fix them anyway.)  Fixes bug 30151; bugfix on
+      0.4.0.1-alpha.
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
@@ -424,6 +424,7 @@ do_resolve(const char *hostname,
     if (parsed < 2) {
       log_err(LD_NET, "Failed to parse SOCKS5 method selection "
                       "message");
+      socks5_server_method_free(m);
       goto err;
     }