summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug32134
-rw-r--r--src/or/circuitbuild.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug3213 b/changes/bug3213
new file mode 100644
index 0000000000..ab7de2d629
--- /dev/null
+++ b/changes/bug3213
@@ -0,0 +1,4 @@
+ o Major bugfixes:
+ - Fix a crash bug when changing bridges in a running Tor process.
+ Fixes bug 3213; bugfix on 0.2.2.26-beta.
+
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 860cd27567..2f86e1fa34 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -4539,7 +4539,7 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr,
!tor_addr_compare(&bridge->addr, addr, CMP_EXACT) &&
bridge->port == port)
return bridge;
- if (tor_memeq(bridge->identity, digest, DIGEST_LEN))
+ if (digest && tor_memeq(bridge->identity, digest, DIGEST_LEN))
return bridge;
}
SMARTLIST_FOREACH_END(bridge);