Assert that dircollator is collated when we're reading its output.

Fix for 17668.S2.

diff --git a/src/or/dircollate.c b/src/or/dircollate.c
index ca8b7ca84757b0add167e41d976d315fd63ab937..2f02512d3e0ded898d6cf0fe4a5c381db25efb4d 100644 (file)
--- a/src/or/dircollate.c
+++ b/src/or/dircollate.c
@@ -303,6 +303,7 @@ dircollator_collate_by_ed25519(dircollator_t *dc)
 int
 dircollator_n_routers(dircollator_t *dc)
 {
+  tor_assert(dc->is_collated);
   return smartlist_len(dc->all_rsa_sha1_lst);
 }
 
@@ -317,6 +318,7 @@ dircollator_n_routers(dircollator_t *dc)
 vote_routerstatus_t **
 dircollator_get_votes_for_router(dircollator_t *dc, int idx)
 {
+  tor_assert(dc->is_collated);
   tor_assert(idx < smartlist_len(dc->all_rsa_sha1_lst));
   return digestmap_get(dc->by_collated_rsa_sha1,
                        smartlist_get(dc->all_rsa_sha1_lst, idx));