]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Remove dead code in networkstatus.c
authorDavid Goulet <dgoulet@torproject.org>
Wed, 25 Apr 2018 13:35:32 +0000 (09:35 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 25 Apr 2018 13:35:32 +0000 (09:35 -0400)
We can't end up in the removed else {} condition since we first validate the
flavor we get and then we validate the flavor we parse from the given
consensus which means we can only handle the two flavors of the if/elseif
conditions.

Fixes #25914

Signed-off-by: David Goulet <dgoulet@torproject.org>
src/or/networkstatus.c

index b0db0cecbc847313c120a67637741bf440071280..d545ac120afb7d2fb409d98fa618916c1abd9bb8 100644 (file)
@@ -1841,17 +1841,9 @@ networkstatus_set_current_consensus(const char *consensus,
       current_valid_after = current_md_consensus->valid_after;
     }
   } else {
-    cached_dir_t *cur;
-    char buf[128];
-    tor_snprintf(buf, sizeof(buf), "cached-%s-consensus", flavor);
-    consensus_fname = get_cachedir_fname(buf);
-    tor_snprintf(buf, sizeof(buf), "unverified-%s-consensus", flavor);
-    unverified_fname = get_cachedir_fname(buf);
-    cur = dirserv_get_consensus(flavor);
-    if (cur) {
-      current_digests = &cur->digests;
-      current_valid_after = cur->published;
-    }
+    tor_assert_nonfatal_unreached();
+    result = -2;
+    goto done;
   }
 
   if (current_digests &&