aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug42594
-rw-r--r--src/or/connection_edge.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug4259 b/changes/bug4259
new file mode 100644
index 0000000000..bfccd3aee8
--- /dev/null
+++ b/changes/bug4259
@@ -0,0 +1,4 @@
+ o Major bugfixes:
+ - Fix a crash bug when changing node restrictions while a DNS lookup
+ is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix
+ by "Tey'".
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 6a696092eb..4763bf59a2 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -831,7 +831,10 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options)
char *nodename;
routerinfo_t *ri; /* XXX023 Use node_t. */
- if (strcmpend(target, ".exit")) {
+ if (!target) {
+ /* DNS resolving in progress */
+ continue;
+ } else if (strcmpend(target, ".exit")) {
/* Not a .exit mapping */
continue;
} else if (ent->source != ADDRMAPSRC_TRACKEXIT) {