diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 20:30:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 20:30:30 -0400 |
| commit | 6a0dc0e585cbd9d53c91fe217adf2a4d4754694e (patch) | |
| tree | 7345658d6a09b2b0f9487b0e66b3fa500f57836c | |
| parent | 08ced4a7bf17f5c9d2868649dfa844248d15614e (diff) | |
| parent | 47f7085de7a496b6bfa79de9e1b22ca4a28b0f27 (diff) | |
| download | tor-6a0dc0e585cbd9d53c91fe217adf2a4d4754694e.tar tor-6a0dc0e585cbd9d53c91fe217adf2a4d4754694e.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug11437 | 3 | ||||
| -rw-r--r-- | src/or/dns.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug11437 b/changes/bug11437 new file mode 100644 index 000000000..f5117cae9 --- /dev/null +++ b/changes/bug11437 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Stop leaking memory when we successfully resolve a PTR record. + Fixes bug 11437; bugfix on 0.2.4.7-alpha. diff --git a/src/or/dns.c b/src/or/dns.c index a88a46eb7..21c82e806 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1353,6 +1353,7 @@ inform_pending_connections(cached_resolve_t *resolve) } resolve->pending_connections = pend->next; tor_free(pend); + tor_free(hostname); } } |