From: Roger Dingledine <arma@torproject.org>
Date: Wed, 23 Mar 2005 00:19:51 +0000 (+0000)
Subject: maybe resolve an assert trigger i just got:
X-Git-Tag: tor-0.1.0.1-rc~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a523439cbc131facdcde10f6c25edb1a8f995724;p=thirdparty%2Ftor.git

maybe resolve an assert trigger i just got:
connection_edge.c:643 address_is_in_virtual_range: Assertion addr failed; aborting.
nick, what do you think?


svn:r3825
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5550e55518..db301a715b 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -551,12 +551,12 @@ void addressmap_register(const char *address, char *new_address, time_t expires)
     }
     return;
   }
-  if (ent) { /* we'll replace it */
+  if (ent && ent->new_address) { /* we'll replace it */
     if (address_is_in_virtual_range(ent->new_address)) {
       addressmap_virtaddress_remove(address, ent);
     }
     tor_free(ent->new_address);
-  } else { /* make a new one and register it */
+  } else if (!ent) { /* make a new one and register it */
     ent = tor_malloc_zero(sizeof(addressmap_entry_t));
     strmap_set(addressmap, address, ent);
   }