From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Jan 2011 18:37:39 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.3.1-alpha~192^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6329eda96e88ebe7211204b0cc34340f14ce938;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
---

d6329eda96e88ebe7211204b0cc34340f14ce938
diff --cc src/or/connection_edge.c
index 87efb15da7,4caa01cb50..4ae0ccf36a
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@@ -1476,10 -1430,14 +1491,15 @@@ connection_ap_handshake_rewrite_and_att
        const char *new_addr;
        new_addr = addressmap_register_virtual_address(
                                RESOLVED_TYPE_IPV4, tor_strdup(socks->address));
-       tor_assert(new_addr);
+       if (! new_addr) {
+         log_warn(LD_APP, "Unable to automap address %s",
+                  escaped_safe_str(socks->address));
+         connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL);
+         return -1;
+       }
        log_info(LD_APP, "Automapping %s to %s",
 -               escaped_safe_str(socks->address), safe_str(new_addr));
 +               escaped_safe_str_client(socks->address),
 +               safe_str_client(new_addr));
        strlcpy(socks->address, new_addr, sizeof(socks->address));
      }
    }