diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-14 13:30:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-14 13:30:10 -0500 |
| commit | 1686f81ac25328382a46ffe569db1d371f6b6be2 (patch) | |
| tree | 95bf3c3ea57ad8beaae7079d222711442bdda4e9 | |
| parent | 518b0b3c5fefba2458181c7f733bc684e5466cf9 (diff) | |
| parent | f2fb85f9707a37b15d790386e0283f53d640b16b (diff) | |
| download | tor-1686f81ac25328382a46ffe569db1d371f6b6be2.tar.gz tor-1686f81ac25328382a46ffe569db1d371f6b6be2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -rw-r--r-- | changes/bug14195 | 3 | ||||
| -rw-r--r-- | src/or/addressmap.c | 2 |
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 9d92eb7903..64654218ef 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -957,7 +957,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 " |