summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-11-06 18:00:09 +0000
committerNick Mathewson <nickm@torproject.org>2007-11-06 18:00:09 +0000
commit6bc071f765d2829249db52b526c8f5211cb3ba5f (patch)
treeb859aa8b165c62a9765f145845910af7e8cc6943
parente047f7f8652d9c67ed96d4ff6f02fa7e23333c54 (diff)
downloadtor-6bc071f765d2829249db52b526c8f5211cb3ba5f.tar.gz
tor-6bc071f765d2829249db52b526c8f5211cb3ba5f.zip
r16456@catbus: nickm | 2007-11-06 12:59:04 -0500
Fix a dumb bug in networkstatus_free_all() svn:r12397
-rw-r--r--src/or/networkstatus.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index f724d6752a..33996f47eb 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1325,6 +1325,8 @@ networkstatus_set_current_consensus(const char *consensus, int from_cache,
consensus_waiting_for_certs = NULL;
if (consensus != consensus_waiting_for_certs_body)
tor_free(consensus_waiting_for_certs_body);
+ else
+ consensus_waiting_for_certs_body = NULL;
consensus_waiting_for_certs_set_at = 0;
consensus_waiting_for_certs_dl_failed = 0;
unlink(unverified_fname);
@@ -1727,8 +1729,8 @@ networkstatus_free_all(void)
current_consensus = NULL;
}
if (consensus_waiting_for_certs) {
- networkstatus_vote_free(current_consensus);
- current_consensus = NULL;
+ networkstatus_vote_free(consensus_waiting_for_certs);
+ consensus_waiting_for_certs = NULL;
}
tor_free(consensus_waiting_for_certs_body);
if (named_server_map) {