mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 05:03:43 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/connection_edge.c Conflicted on a router->node transition; fix was easy.
This commit is contained in:
commit
9ef2cd7776
5
changes/bug3923
Normal file
5
changes/bug3923
Normal file
@ -0,0 +1,5 @@
|
||||
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.
|
||||
|
@ -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 ||
|
||||
|
Loading…
Reference in New Issue
Block a user