From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 May 2011 23:46:47 +0000 (-0400)
Subject: Handle NULL argument to get_configured_bridge_by_addr_port_digest
X-Git-Tag: tor-0.2.3.2-alpha~110^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21ed575826e701437f7893536ffc5c8d2a71532f;p=thirdparty%2Ftor.git

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