[or-cvs] [tor/maint-0.2.2] Fix a logic error in 98aee84. Found by boboper

[nickm@xxxxxxxxxxxxxx]

Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed, 20 Oct 2010 14:40:09 -0400
Subject: Fix a logic error in 98aee84. Found by boboper
Commit: 0ac9a3df6c4ca57dbf5c04ac50d74747451d1494

---
 src/or/networkstatus.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 27049d9..d645ee2 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1569,6 +1569,7 @@ networkstatus_set_current_consensus(const char *consensus,
   const digests_t *current_digests = NULL;
   consensus_waiting_for_certs_t *waiting = NULL;
   time_t current_valid_after = 0;
+  int free_consensus = 1; /* Free 'c' at the end of the function */
 
   if (flav < 0) {
     /* XXXX we don't handle unrecognized flavors yet. */
@@ -1661,7 +1662,7 @@ networkstatus_set_current_consensus(const char *consensus,
         networkstatus_vote_free(waiting->consensus);
         tor_free(waiting->body);
         waiting->consensus = c;
-        c = NULL; /* Prevent free. */
+        free_consensus = 0;
         waiting->body = tor_strdup(consensus);
         waiting->set_at = now;
         waiting->dl_failed = 0;
@@ -1737,7 +1738,7 @@ networkstatus_set_current_consensus(const char *consensus,
 
   if (flav == USABLE_CONSENSUS_FLAVOR) {
     current_consensus = c;
-    c = NULL; /* Prevent free. */
+    free_consensus = 0; /* Prevent free. */
 
     /* XXXXNM Microdescs: needs a non-ns variant. */
     update_consensus_networkstatus_fetch_time(now);
@@ -1780,7 +1781,8 @@ networkstatus_set_current_consensus(const char *consensus,
 
   result = 0;
  done:
-  networkstatus_vote_free(c);
+  if (free_consensus)
+    networkstatus_vote_free(c);
   tor_free(consensus_fname);
   tor_free(unverified_fname);
   return result;
-- 
1.7.1