Commit 9ef2cd77 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2' 

Conflicts:
	src/or/connection_edge.c

Conflicted on a router->node transition; fix was easy.
parents 7ca16aff 2bf0e747

changes/bug3923

0 → 100644
+5 −0
Changes for changes/bug3923: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Major bugfies:

    - Avoid an assertion failure when reloading a configuration with

      TrackExitHosts changes.  Found and fixed by 'laruldan'. Fixes

      bug 3923; bugfix on 0.2.2.25-alpha.

src/or/connection_edge.c

+4 −6
Changes for src/or/connection_edge.c: 4 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -930,12 +930,10 @@ addressmap_clear_excluded_trackexithosts(const or_options_t *options) 
    if (len < 6)

      continue; /* malformed. */

    dot = target + len - 6; /* dot now points to just before .exit */

    dot = strrchr(dot, '.'); /* dot now points to the . before .exit or NULL */

    if (!dot) {

      nodename = tor_strndup(target, len-5);

    } else {

      nodename = tor_strndup(dot+1, strlen(dot+1)-5);

    }

    while(dot > target && *dot != '.')

	dot--;

    if (*dot == '.') dot++;

    nodename = tor_strndup(dot, len-5-(dot-target));;

    node = node_get_by_nickname(nodename, 0);

    tor_free(nodename);

    if (!node ||