[or-cvs] r11088: Make voting actually function. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-13 15:55:08 -0400 (Mon, 13 Aug 2007)
New Revision: 11088

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r14536 at catbus:  nickm | 2007-08-13 15:54:17 -0400
 Make voting actually function.



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

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-08-13 19:16:44 UTC (rev 11087)
+++ tor/trunk/src/or/dirserv.c	2007-08-13 19:55:08 UTC (rev 11088)
@@ -1967,8 +1967,8 @@
   smartlist_free(routers);
   digestmap_free(omit_as_sybil, NULL);
 
-  tor_assert(v3_out);
-  memset(v3_out, 0, sizeof(networkstatus_vote_t));
+  v3_out = tor_malloc_zero(sizeof(networkstatus_vote_t));
+
   v3_out->is_vote = 1;
   dirvote_get_preferred_voting_intervals(&timing);
   v3_out->published = now;