aboutsummaryrefslogtreecommitdiff
path: root/src/or/entrynodes.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-21 07:47:42 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-21 07:47:42 -0400
commite9ffd9890f6073bc2fc3be36be2fd521a4f3af96 (patch)
treea118144ab8a281da5624ada0bdec82c9066506f4 /src/or/entrynodes.c
parentea6d53e7246cb66efc054b5f5a235000c528eff5 (diff)
downloadtor-e9ffd9890f6073bc2fc3be36be2fd521a4f3af96.tar
tor-e9ffd9890f6073bc2fc3be36be2fd521a4f3af96.tar.gz
Remove check for whether bridge_line->digest is NULL
It can never be NULL, since it's an array in bridge_line_t. Introduced in 266f8cddd87f. Found by coverity; this is CID 992691. Bug not in any released Tor.
Diffstat (limited to 'src/or/entrynodes.c')
-rw-r--r--src/or/entrynodes.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 1ce78e512..48eb309ce 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1766,8 +1766,7 @@ bridge_add_from_config(bridge_line_t *bridge_line)
b = tor_malloc_zero(sizeof(bridge_info_t));
tor_addr_copy(&b->addr, &bridge_line->addr);
b->port = bridge_line->port;
- if (bridge_line->digest)
- memcpy(b->identity, bridge_line->digest, DIGEST_LEN);
+ memcpy(b->identity, bridge_line->digest, DIGEST_LEN);
if (bridge_line->transport_name)
b->transport_name = bridge_line->transport_name;
b->fetch_status.schedule = DL_SCHED_BRIDGE;