diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-20 21:32:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-20 21:32:27 -0400 |
| commit | d17b9bf1a5ba2fba56293e7024d6f8f43e3688ab (patch) | |
| tree | b9ce41fd893053b9642fb243f41b0d88f0cbcfb1 /src/or/networkstatus.c | |
| parent | 444193ff5df901073823e38fc291e913164e61e0 (diff) | |
| parent | 0ac9a3df6c4ca57dbf5c04ac50d74747451d1494 (diff) | |
| download | tor-d17b9bf1a5ba2fba56293e7024d6f8f43e3688ab.tar.gz tor-d17b9bf1a5ba2fba56293e7024d6f8f43e3688ab.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/networkstatus.c
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 7ff6a8b631..11017836db 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1593,7 +1593,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; + int free_consensus = 1; /* Free 'c' at the end of the function */ if (flav < 0) { /* XXXX we don't handle unrecognized flavors yet. */ @@ -1693,7 +1693,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; |