|
@@ -2577,7 +2577,7 @@ get_next_valid_after_time(time_t now)
|
|
tor_assert(new_voting_schedule);
|
|
tor_assert(new_voting_schedule);
|
|
|
|
|
|
next_valid_after_time = new_voting_schedule->interval_starts;
|
|
next_valid_after_time = new_voting_schedule->interval_starts;
|
|
- free_voting_schedule(new_voting_schedule);
|
|
+ voting_schedule_free(new_voting_schedule);
|
|
|
|
|
|
return next_valid_after_time;
|
|
return next_valid_after_time;
|
|
}
|
|
}
|
|
@@ -2601,7 +2601,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now)
|
|
|
|
|
|
|
|
|
|
memcpy(&voting_schedule, new_voting_schedule, sizeof(voting_schedule));
|
|
memcpy(&voting_schedule, new_voting_schedule, sizeof(voting_schedule));
|
|
- free_voting_schedule(new_voting_schedule);
|
|
+ voting_schedule_free(new_voting_schedule);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -2660,10 +2660,13 @@ get_voting_schedule(const or_options_t *options, time_t now, int severity)
|
|
return new_voting_schedule;
|
|
return new_voting_schedule;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
+
|
|
|
|
+ * tor_free. */
|
|
void
|
|
void
|
|
-free_voting_schedule(voting_schedule_t *voting_schedule_to_free)
|
|
+voting_schedule_free(voting_schedule_t *voting_schedule_to_free)
|
|
{
|
|
{
|
|
|
|
+ if (!voting_schedule_to_free)
|
|
|
|
+ return;
|
|
tor_free(voting_schedule_to_free);
|
|
tor_free(voting_schedule_to_free);
|
|
}
|
|
}
|
|
|
|
|