Browse Source

Handle NULL argument to get_configured_bridge_by_addr_port_digest

Fixes bug 2313; bugfix on 0.2.2.26-beta.
Nick Mathewson 13 years ago
parent
commit
21ed575826
2 changed files with 5 additions and 1 deletions
  1. 4 0
      changes/bug3213
  2. 1 1
      src/or/circuitbuild.c

+ 4 - 0
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.
+

+ 1 - 1
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);