summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-17 19:46:47 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-17 19:46:47 -0400
commit21ed575826e701437f7893536ffc5c8d2a71532f (patch)
tree7684ba4f93535cdb6d3eb1e9fcece6caa31c980d /src/or/circuitbuild.c
parent2e07925a5285fd50626e853c48ab5b79eec8e933 (diff)
downloadtor-21ed575826e701437f7893536ffc5c8d2a71532f.tar.gz
tor-21ed575826e701437f7893536ffc5c8d2a71532f.zip
Handle NULL argument to get_configured_bridge_by_addr_port_digest
Fixes bug 2313; bugfix on 0.2.2.26-beta.
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
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);