aboutsummaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-04-18 11:26:54 -0400
committerNick Mathewson <nickm@torproject.org>2013-04-18 11:26:54 -0400
commit06efbbb47ef28dd24cb4482f5b82204918891f41 (patch)
treefc8779c441219c645326d80a7d22827d48823839 /src/or/networkstatus.c
parent9fec0c1a95ab24f5f18d6995e30fe2111e6b7db2 (diff)
parentcd2b508f4ec22e85104065058722293a951be200 (diff)
downloadtor-06efbbb47ef28dd24cb4482f5b82204918891f41.tar
tor-06efbbb47ef28dd24cb4482f5b82204918891f41.tar.gz
Merge remote-tracking branch 'public/bug8719' into maint-0.2.4
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index f5428f165..871584154 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1878,11 +1878,12 @@ networkstatus_note_certs_arrived(void)
if (!waiting->consensus)
continue;
if (networkstatus_check_consensus_signature(waiting->consensus, 0)>=0) {
+ char *waiting_body = waiting->body;
if (!networkstatus_set_current_consensus(
- waiting->body,
+ waiting_body,
networkstatus_get_flavor_name(i),
NSSET_WAS_WAITING_FOR_CERTS)) {
- tor_free(waiting->body);
+ tor_free(waiting_body);
}
}
}