[or-cvs] r12397: Fix a dumb bug in networkstatus_free_all() (in tor/trunk: . src/or)

nickm at seul.org nickm at seul.org
Tue Nov 6 18:00:09 UTC 2007


Author: nickm
Date: 2007-11-06 13:00:09 -0500 (Tue, 06 Nov 2007)
New Revision: 12397

Modified:
   tor/trunk/
   tor/trunk/src/or/networkstatus.c
Log:
 r16456 at catbus:  nickm | 2007-11-06 12:59:04 -0500
 Fix a dumb bug in networkstatus_free_all()



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16456] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-11-06 18:00:07 UTC (rev 12396)
+++ tor/trunk/src/or/networkstatus.c	2007-11-06 18:00:09 UTC (rev 12397)
@@ -1325,6 +1325,8 @@
     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 @@
     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) {



More information about the tor-commits mailing list