Handle NULL argument to get_configured_bridge_by_addr_port_digest

Fixes bug 2313; bugfix on 0.2.2.26-beta.

diff --git a/changes/bug3213 b/changes/bug3213
new file mode 100644 (file)
index 0000000..ab7de2d
--- /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 860cd27567222a66c057ae54a89bb0b0cd9c4716..2f86e1fa34a4f642570ea5fd07873e3eccd1498b 100644 (file)
--- 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);