Просмотр исходного кода

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.
Nick Mathewson 11 лет назад
Родитель
Сommit
e9ffd9890f
1 измененных файлов с 1 добавлено и 2 удалено
  1. 1 2
      src/or/entrynodes.c

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