summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-13 12:24:42 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-13 12:24:42 -0500
commitf2fb85f9707a37b15d790386e0283f53d640b16b (patch)
treeebf13ebbbe2444204c9f7cd53e4ba577756762fb
parentc9dd2d1a6ad2684442abb7a31e29b0998aaf605c (diff)
downloadtor-f2fb85f9707a37b15d790386e0283f53d640b16b.tar.gz
tor-f2fb85f9707a37b15d790386e0283f53d640b16b.zip
Remove needless strdup in addressmap_register_virtual_address()
Fixes bug 14195. Bugfix on 0.1.0.1-rc.
-rw-r--r--changes/bug141953
-rw-r--r--src/or/addressmap.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug14195 b/changes/bug14195
new file mode 100644
index 0000000000..d2b82f31b0
--- /dev/null
+++ b/changes/bug14195
@@ -0,0 +1,3 @@
+ o Minor bugfixes (client):
+ - Fix a memory leak when using AutomapHostsOnResolve.
+ Fixes bug 14195; bugfix on 0.1.0.1-rc.
diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 4253532cec..d4b7acf274 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -951,7 +951,7 @@ addressmap_register_virtual_address(int type, char *new_address)
!strcasecmp(new_address, ent->new_address)) {
tor_free(new_address);
tor_assert(!vent_needs_to_be_added);
- return tor_strdup(*addrp);
+ return *addrp;
} else {
log_warn(LD_BUG,
"Internal confusion: I thought that '%s' was mapped to by "