[tor-commits] [tor/master] Minor IPv6-related memory leak fixes

[nickm at torproject.org]

commit 4385211caf6ad4cf34c0a3aaaba42d81048fddf6
Author: Tom van der Woerdt <info at tvdw.eu>
Date:   Tue Jan 6 19:40:23 2015 +0100

    Minor IPv6-related memory leak fixes
---
 src/or/addressmap.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 33f11cb..ece69ea 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -104,6 +104,7 @@ addressmap_virtaddress_ent_free(void *_ent)
 
   ent = _ent;
   tor_free(ent->ipv4_address);
+  tor_free(ent->ipv6_address);
   tor_free(ent->hostname_address);
   tor_free(ent);
 }
@@ -121,9 +122,11 @@ addressmap_virtaddress_remove(const char *address, addressmap_entry_t *ent)
     if (ve) {
       if (!strcmp(address, ve->ipv4_address))
         tor_free(ve->ipv4_address);
+      if (!strcmp(address, ve->ipv6_address))
+        tor_free(ve->ipv6_address);
       if (!strcmp(address, ve->hostname_address))
         tor_free(ve->hostname_address);
-      if (!ve->ipv4_address && !ve->hostname_address) {
+      if (!ve->ipv4_address && !ve->ipv6_address && !ve->hostname_address) {
         tor_free(ve);
         strmap_remove(virtaddress_reversemap, ent->new_address);
       }