[tor-commits] [tor/master] Remove check for whether bridge_line->digest is NULL

[nickm at torproject.org]

commit e9ffd9890f6073bc2fc3be36be2fd521a4f3af96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 21 07:47:42 2013 -0400

    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.
---
 src/or/entrynodes.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 1ce78e5..48eb309 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;