r14536@catbus: nickm | 2007-08-13 15:54:17 -0400

 Make voting actually function.

svn:r11088

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index a73c450897247083b3de14ee6e0daf40d5f4253e..e481723f2ea94c3d3102264f13d725d8b970dff4 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1967,8 +1967,8 @@ generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
   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;