summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-28 22:44:45 -0500
committerNick Mathewson <nickm@torproject.org>2012-12-28 22:45:53 -0500
commitb509ead20d93277697c1cb961a2ae520bce7fd7f (patch)
tree84aa8676631ce75314f4d1ae427f37b50ae1c469
parent4b571d3ab3d4c8e13fe0bc73f15431294d19615a (diff)
downloadtor-b509ead20d93277697c1cb961a2ae520bce7fd7f.tar.gz
tor-b509ead20d93277697c1cb961a2ae520bce7fd7f.zip
Avoid leaking headers received from SSL proxy
Fixes part of 7816. Spotted by coverity. Fix on 0.2.2.1-alpha.
-rw-r--r--changes/bug7816_0234
-rw-r--r--src/or/connection.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug7816_023 b/changes/bug7816_023
index cfa754a996..a4530292cc 100644
--- a/changes/bug7816_023
+++ b/changes/bug7816_023
@@ -1,3 +1,7 @@
o Minor bugfixes (memory leak, controller):
- Fix a memory leak during safe-cookie controller authentication.
Spotted by Coverity. Fixes part of bug 7816; bugfix on 0.2.3.13-alpha.
+
+ o Minor bugfixes (memory leak, HTTPS proxy support):
+ - Fix a memory leak when receiving headers from an HTTPS proxy.
+ Spotted by Coverity. Fixes part of bug 7816; bugfix on 0.2.1.1-alpha.
diff --git a/src/or/connection.c b/src/or/connection.c
index eac9c4f32b..4c6826269d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1607,6 +1607,7 @@ connection_read_https_proxy_response(connection_t *conn)
tor_free(headers);
return -1;
}
+ tor_free(headers);
if (!reason) reason = tor_strdup("[no reason given]");
if (status_code == 200) {